git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2947923 6a143aa)
Merge branch 'jn/unpack-trees-checkout-m-carry-deletion'
authorJunio C Hamano <redacted>
Thu, 11 Sep 2014 17:33:35 +0000 (10:33 -0700)
committerJunio C Hamano <redacted>
Thu, 11 Sep 2014 17:33:36 +0000 (10:33 -0700)
commitf28763d7561f66c0c6ff9b5d48146a0f923781d3
tree302aba13e921f492b4033477062dbacb3f05628atree | snapshot
parent294792326ae86c276897a0fd694948d2fb5640decommit | diff
parent6a143aa2b23b97fa8363e2f4fd16f23b4c5b104dcommit | diff
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
unpack-trees.c diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT