diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2011-11-22 19:27:21 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-11-22 18:16:59 -0800 |
| commit | 539047c19ec040819b6f6af2d55714195b812abb (patch) | |
| tree | d84dbed3909b0311fc9108dc5c96c87a51394288 /Documentation | |
| parent | revert: write REVERT_HEAD pseudoref during conflicted revert (diff) | |
| download | tgif-539047c19ec040819b6f6af2d55714195b812abb.tar.xz | |
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')
| -rw-r--r-- | Documentation/git-cherry-pick.txt | 1 | ||||
| -rw-r--r-- | Documentation/git-revert.txt | 1 | ||||
| -rw-r--r-- | Documentation/sequencer.txt | 3 |
3 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 21998b820e..fed5097e00 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -11,6 +11,7 @@ SYNOPSIS 'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] <commit>... 'git cherry-pick' --continue 'git cherry-pick' --quit +'git cherry-pick' --abort DESCRIPTION ----------- diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt index b0fcabc8b6..b699a3458e 100644 --- a/Documentation/git-revert.txt +++ b/Documentation/git-revert.txt @@ -11,6 +11,7 @@ SYNOPSIS 'git revert' [--edit | --no-edit] [-n] [-m parent-number] [-s] <commit>... 'git revert' --continue 'git revert' --quit +'git revert' --abort DESCRIPTION ----------- 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. |