| commit | 39e415cfd1390ed31a61ca0ca175530302c9a58c | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 20 Aug 2018 19:41:34 +0000 (20 12:41 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 20 Aug 2018 19:41:34 +0000 (20 12:41 -0700) | ||
| tree | 3d534af538a48ff09aa5781d91630a15da2508b3 | treesnapshot (tar.gz zip) |
| parent | 85c54ecc5f26d5273f15ef64e8d756353b222d3b | commitdiff |
| parent | 3e7dd9920823fc2a88f8ec5390bd100d707f9129 | commitdiff |
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
"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
| builtin/revert.c | diff1 | diff2 | blobhistory |
| t/t3510-cherry-pick-sequence.sh | diff1 | diff2 | blobhistory |