diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-11 10:33:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-11 10:33:36 -0700 |
| commit | f28763d7561f66c0c6ff9b5d48146a0f923781d3 (patch) | |
| tree | 302aba13e921f492b4033477062dbacb3f05628a /log-tree.c | |
| parent | 294792326ae86c276897a0fd694948d2fb5640de (diff) | |
| parent | 6a143aa2b23b97fa8363e2f4fd16f23b4c5b104d (diff) | |
| download | git-f28763d7561f66c0c6ff9b5d48146a0f923781d3.tar.gz | |
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
Diffstat (limited to 'log-tree.c')
0 files changed, 0 insertions, 0 deletions