| commit | f28763d7561f66c0c6ff9b5d48146a0f923781d3 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 11 Sep 2014 17:33:35 +0000 (11 10:33 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 11 Sep 2014 17:33:36 +0000 (11 10:33 -0700) | ||
| tree | 302aba13e921f492b4033477062dbacb3f05628a | treesnapshot (tar.gz zip) |
| parent | 294792326ae86c276897a0fd694948d2fb5640de | commitdiff |
| parent | 6a143aa2b23b97fa8363e2f4fd16f23b4c5b104d | commitdiff |
Merge branch 'jn/unpack-trees-checkout-m-carry-deletion'
"git checkout -m" did not switch to another branch while carrying
the local changes forward when a path was deleted from the index.
* 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
"git checkout -m" did not switch to another branch while carrying
the local changes forward when a path was deleted from the index.
* 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 |