summaryrefslogtreecommitdiff
path: root/diffcore-pickaxe.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-04-03 13:39:03 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-04-03 13:39:03 -0700
commit6248be7678ad2c262a460c052ef4f28744e75cc4 (patch)
treea2f7250376bcf36926791a73cde9615dd70111af /diffcore-pickaxe.c
parentMerge branch 'jn/wt-status' into maint (diff)
parentstash pop: mention we did not drop the stash upon failing to apply (diff)
downloadtgif-6248be7678ad2c262a460c052ef4f28744e75cc4.tar.xz
Merge branch 'jc/stash-pop-not-popped' into maint
* jc/stash-pop-not-popped: stash pop: mention we did not drop the stash upon failing to apply
Diffstat (limited to 'diffcore-pickaxe.c')
0 files changed, 0 insertions, 0 deletions