summaryrefslogtreecommitdiff
path: root/Documentation/git-stash.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-09-11 10:33:35 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-09-11 10:33:36 -0700
commitf28763d7561f66c0c6ff9b5d48146a0f923781d3 (patch)
tree302aba13e921f492b4033477062dbacb3f05628a /Documentation/git-stash.txt
parentMerge branch 'rs/list-optim' (diff)
parentcheckout -m: attempt merge when deletion of path was staged (diff)
downloadtgif-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 'Documentation/git-stash.txt')
0 files changed, 0 insertions, 0 deletions