git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 85c54ec 3e7dd99)
Merge branch 'nd/cherry-pick-quit-fix'
authorJunio C Hamano <redacted>
Mon, 20 Aug 2018 19:41:34 +0000 (12:41 -0700)
committerJunio C Hamano <redacted>
Mon, 20 Aug 2018 19:41:34 +0000 (12:41 -0700)
commit39e415cfd1390ed31a61ca0ca175530302c9a58c
tree3d534af538a48ff09aa5781d91630a15da2508b3tree | snapshot
parent85c54ecc5f26d5273f15ef64e8d756353b222d3bcommit | diff
parent3e7dd9920823fc2a88f8ec5390bd100d707f9129commit | diff
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
builtin/revert.c diff1 | diff2 | blob | history
t/t3510-cherry-pick-sequence.sh diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT