summaryrefslogtreecommitdiff
path: root/Documentation/user-manual.conf
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-08-20 12:41:34 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-08-20 12:41:34 -0700
commit39e415cfd1390ed31a61ca0ca175530302c9a58c (patch)
tree3d534af538a48ff09aa5781d91630a15da2508b3 /Documentation/user-manual.conf
parentMerge branch 'sb/submodule-cleanup' (diff)
parentcherry-pick: fix --quit not deleting CHERRY_PICK_HEAD (diff)
downloadtgif-39e415cfd1390ed31a61ca0ca175530302c9a58c.tar.xz
Merge branch 'nd/cherry-pick-quit-fix'
"git cherry-pick --quit" failed to remove CHERRY_PICK_HEAD even though we won't be in a cherry-pick session after it returns, which has been corrected. * nd/cherry-pick-quit-fix: cherry-pick: fix --quit not deleting CHERRY_PICK_HEAD
Diffstat (limited to 'Documentation/user-manual.conf')
0 files changed, 0 insertions, 0 deletions