| commit | f3b173daf400813c7f587a011290dac31de2b68e | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 11 May 2011 18:37:46 +0000 (11 11:37 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 11 May 2011 18:37:46 +0000 (11 11:37 -0700) | ||
| tree | 588db086f294f64dd97a51b90d8fe2f60c17b6c1 | treesnapshot (tar.gz zip) |
| parent | 9cd805de613c5984432acb778636f44d0fb596f8 | commitdiff |
| parent | 0bf9fc0cd28bf8e983a5280676fcaeb826403516 | commitdiff |
Merge branch 'jc/maint-add-p-overlapping-hunks'
* jc/maint-add-p-overlapping-hunks:
t3701: add-p-fix makes the last test to pass
"add -p": work-around an old laziness that does not coalesce hunks
add--interactive.perl: factor out repeated --recount option
t3701: Editing a split hunk in an "add -p" session
add -p: 'q' should really quit
* jc/maint-add-p-overlapping-hunks:
t3701: add-p-fix makes the last test to pass
"add -p": work-around an old laziness that does not coalesce hunks
add--interactive.perl: factor out repeated --recount option
t3701: Editing a split hunk in an "add -p" session
add -p: 'q' should really quit
| builtin/apply.c | diff1 | diff2 | blobhistory |
| t/t3701-add-interactive.sh | diff1 | diff2 | blobhistory |