mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jn/revert-quit'

Browse Source 
* jn/revert-quit:
  revert: remove --reset compatibility option
  revert: introduce --abort to cancel a failed cherry-pick
  revert: write REVERT_HEAD pseudoref during conflicted revert
  revert: improve error message for cherry-pick during cherry-pick
  revert: rearrange pick_revisions() for clarity
  revert: rename --reset option to --quit
This commit is contained in:
Junio C Hamano
2011-11-22 18:22:08 -08:00
parent e14d631988 c427b211b3
commit 9fd389b650
10 changed files with 315 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/git-cherry-pick.txt
View File

@ -9,8 +9,9 @@ SYNOPSIS
--------
[verse]
'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] <commit>...
'git cherry-pick' --reset
'git cherry-pick' --continue
'git cherry-pick' --quit
'git cherry-pick' --abort
DESCRIPTION
-----------

3
Documentation/git-revert.txt
View File

@ -9,8 +9,9 @@ SYNOPSIS
--------
[verse]
'git revert' [--edit | --no-edit] [-n] [-m parent-number] [-s] <commit>...
'git revert' --reset
'git revert' --continue
'git revert' --quit
'git revert' --abort
DESCRIPTION
-----------

13
Documentation/sequencer.txt
View File

@ -1,9 +1,12 @@
--reset::
Forget about the current operation in progress. Can be used
to clear the sequencer state after a failed cherry-pick or
revert.
--continue::
Continue the operation in progress using the information in
'.git/sequencer'. Can be used to continue after resolving
conflicts in a failed cherry-pick or revert.
--quit::
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.