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 /t/t2204-add-ignored.sh | |
| parent | Merge branch 'rs/list-optim' (diff) | |
| parent | checkout -m: attempt merge when deletion of path was staged (diff) | |
| download | tgif-f28763d7561f66c0c6ff9b5d48146a0f923781d3.tar.xz | |
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 't/t2204-add-ignored.sh')
0 files changed, 0 insertions, 0 deletions