| commit | a28e876b9dafe3f042ae057be84613f4504822b3 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 19 Sep 2014 21:05:12 +0000 (19 14:05 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 19 Sep 2014 21:05:12 +0000 (19 14:05 -0700) | ||
| tree | 521b4535fcf72c88b7659517707e2b0056c2eaa0 | treesnapshot (tar.gz zip) |
| parent | f7153344cf2b4fac1ca900ed485de9282a66d6e9 | commitdiff |
| parent | 6a143aa2b23b97fa8363e2f4fd16f23b4c5b104d | commitdiff |
Merge branch 'jn/unpack-trees-checkout-m-carry-deletion' into maint
* jn/unpack-trees-checkout-m-carry-deletion:
checkout -m: attempt merge when deletion of path was staged
unpack-trees: use 'cuddled' style for if-else cascade
unpack-trees: simplify 'all other failures' case
* jn/unpack-trees-checkout-m-carry-deletion:
checkout -m: attempt merge when deletion of path was staged
unpack-trees: use 'cuddled' style for if-else cascade
unpack-trees: simplify 'all other failures' case
| unpack-trees.c | diff1 | diff2 | blobhistory |