• Junio C Hamano's avatar
    Merge branch 'jn/unpack-trees-checkout-m-carry-deletion' · f28763d7
    Junio C Hamano authored
    "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 47.8 KB