| commit | c69e8b693591bc35e8f9421eacb9d59c71807304 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 May 2011 23:36:46 +0000 (16 16:36 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 May 2011 23:36:46 +0000 (16 16:36 -0700) | ||
| tree | fef8fdcbd924820c5b25e2671be2d92219de23aa | treesnapshot (tar.gz zip) |
| parent | 43d532e6ba3450a84cad007062b8ac429d7a8ac3 | commitdiff |
| parent | 0bf9fc0cd28bf8e983a5280676fcaeb826403516 | commitdiff |
Merge branch 'jc/maint-add-p-overlapping-hunks' into maint
* 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 |