merge(third_party/git): Merge squashed git subtree at v2.23.0
Merge commit '1b593e1ea4' as 'third_party/git'
This commit is contained in:
commit
7ef0d62730
3629 changed files with 1139935 additions and 0 deletions
16
third_party/git/Documentation/sequencer.txt
vendored
Normal file
16
third_party/git/Documentation/sequencer.txt
vendored
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
--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.
|
||||
|
||||
--skip::
|
||||
Skip the current commit and continue with the rest of the
|
||||
sequence.
|
||||
|
||||
--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.
|
||||
Loading…
Add table
Add a link
Reference in a new issue