diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-05-11 11:37:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-11 11:37:46 -0700 |
| commit | f3b173daf400813c7f587a011290dac31de2b68e (patch) | |
| tree | 588db086f294f64dd97a51b90d8fe2f60c17b6c1 /t/t4117-apply-reject.sh | |
| parent | Merge branch 'sr/maint-fast-import-tighten-option-parsing' (diff) | |
| parent | t3701: add-p-fix makes the last test to pass (diff) | |
| download | tgif-f3b173daf400813c7f587a011290dac31de2b68e.tar.xz | |
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
Diffstat (limited to 't/t4117-apply-reject.sh')
0 files changed, 0 insertions, 0 deletions