diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2011-12-10 06:59:48 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-12-12 13:32:16 -0800 |
| commit | 7acaaac275a1d338f7b2540779b7ea60f3f0667c (patch) | |
| tree | d7319ca691bcd52b37d71603988dd1107c2dda4c /git-difftool--helper.sh | |
| parent | revert: pass around rev-list args in already-parsed form (diff) | |
| download | tgif-7acaaac275a1d338f7b2540779b7ea60f3f0667c.tar.xz | |
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>
Diffstat (limited to 'git-difftool--helper.sh')
0 files changed, 0 insertions, 0 deletions