| commit | f2823263bd53b62831450277c746c6cbfcb95a15 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 2 Jun 2009 14:46:52 +0000 (2 07:46 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 2 Jun 2009 14:46:52 +0000 (2 07:46 -0700) | ||
| tree | 394b44bd80218db1af71eba168b30ce3ece71850 | treesnapshot (tar.gz zip) |
| parent | db8af4b5ea7b58b2aef0f0c85f7b570719deb0ae | commitdiff |
| parent | 32a90233d147bd697b338326bd1fabf9edc3f1fe | commitdiff |
Merge branch 'jc/maint-add-p-coalesce-fix' into maint
* jc/maint-add-p-coalesce-fix:
t3701: ensure correctly set up repository after skipped tests
Revert "git-add--interactive: remove hunk coalescing"
Splitting a hunk that adds a line at the top fails in "add -p"
* jc/maint-add-p-coalesce-fix:
t3701: ensure correctly set up repository after skipped tests
Revert "git-add--interactive: remove hunk coalescing"
Splitting a hunk that adds a line at the top fails in "add -p"