diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-08-20 12:41:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-20 12:41:34 -0700 |
| commit | 39e415cfd1390ed31a61ca0ca175530302c9a58c (patch) | |
| tree | 3d534af538a48ff09aa5781d91630a15da2508b3 /merge.c | |
| parent | Merge branch 'sb/submodule-cleanup' (diff) | |
| parent | cherry-pick: fix --quit not deleting CHERRY_PICK_HEAD (diff) | |
| download | tgif-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 'merge.c')
0 files changed, 0 insertions, 0 deletions