Code

revert: allow single-pick in the middle of cherry-pick sequence
authorJonathan Nieder <jrnieder@gmail.com>
Sat, 10 Dec 2011 12:59:48 +0000 (06:59 -0600)
committerJunio C Hamano <gitster@pobox.com>
Mon, 12 Dec 2011 21:32:16 +0000 (13:32 -0800)
commit7acaaac275a1d338f7b2540779b7ea60f3f0667c
treed7319ca691bcd52b37d71603988dd1107c2dda4c
parent7f13334e074bb053eccd14787e416306bc4b413a
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 <j6t@kdbg.org>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/revert.c
t/t3510-cherry-pick-sequence.sh