diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2011-11-23 01:27:21 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-23 02:16:59 (GMT) |
| commit | 539047c19ec040819b6f6af2d55714195b812abb (patch) | |
| tree | d84dbed3909b0311fc9108dc5c96c87a51394288 /Documentation/sequencer.txt | |
| parent | 82433cdf4d888639cecddeca162d619cf370417e (diff) | |
| download | git-539047c19ec040819b6f6af2d55714195b812abb.zip git-539047c19ec040819b6f6af2d55714195b812abb.tar.gz git-539047c19ec040819b6f6af2d55714195b812abb.tar.bz2 | |
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 <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/sequencer.txt')
| -rw-r--r-- | Documentation/sequencer.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/sequencer.txt b/Documentation/sequencer.txt index 75f8e86..5747f44 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. |