| commit | 3a5c3aa2a979fb27e5a2ef3397ef908148d7a65b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Aug 2014 19:33:58 +0000 (25 12:33 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Aug 2014 19:33:59 +0000 (25 12:33 -0700) | ||
| tree | 523dbabae1f85c04de474a5274b5ba1ad4790831 | treesnapshot (tar.gz zip) |
| parent | 7ffdf711391f3eed615e4a8319ea08bacad1bf9d | commitdiff |
| parent | 1305264c9b306451ce03bdfcc64429888bb455e9 | commitdiff |
Merge branch 'jn/unpack-trees-checkout-m-carry-deletion' into jch
* jn/unpack-trees-checkout-m-carry-deletion:
SQUASH???
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:
SQUASH???
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 |