git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7f13334)
revert: allow single-pick in the middle of cherry-pick sequence
authorJonathan Nieder <redacted>
Sat, 10 Dec 2011 12:59:48 +0000 (06:59 -0600)
committerJunio C Hamano <redacted>
Mon, 12 Dec 2011 21:32:16 +0000 (13:32 -0800)
commit7acaaac275a1d338f7b2540779b7ea60f3f0667c
treed7319ca691bcd52b37d71603988dd1107c2dda4ctree | snapshot
parent7f13334e074bb053eccd14787e416306bc4b413acommit | diff
revert: allow single-pick in the middle of cherry-pick sequence

After messing up a difficult conflict resolution in the middle of a
cherry-pick sequence, it can be useful to be able to

git checkout HEAD . && git cherry-pick that-one-commit

to restart the conflict resolution. The current code however errors out
saying that another cherry-pick is already in progress.

Suggested-by: Johannes Sixt <redacted>
Signed-off-by: Jonathan Nieder <redacted>
Signed-off-by: Junio C Hamano <redacted>
builtin/revert.c diff | blob | history
t/t3510-cherry-pick-sequence.sh diff | blob | history
git clone https://git.99rst.org/PROJECT