From 539047c19ec040819b6f6af2d55714195b812abb Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Tue, 22 Nov 2011 19:27:21 -0600 Subject: revert: introduce --abort to cancel a failed cherry-pick After running some ill-advised command like "git cherry-pick HEAD..linux-next", the bewildered novice may want to return to more familiar territory. Introduce a "git cherry-pick --abort" command that rolls back the entire cherry-pick sequence and places the repository back on solid ground. Just like "git merge --abort", this internally uses "git reset --merge", so local changes not involved in the conflict resolution are preserved. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- Documentation/sequencer.txt | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Documentation/sequencer.txt') diff --git a/Documentation/sequencer.txt b/Documentation/sequencer.txt index 75f8e869e8..5747f442f2 100644 --- a/Documentation/sequencer.txt +++ b/Documentation/sequencer.txt @@ -7,3 +7,6 @@ Forget about the current operation in progress. Can be used to clear the sequencer state after a failed cherry-pick or revert. + +--abort:: + Cancel the operation and return to the pre-sequence state. -- cgit v1.2.3