diff options
| author | Vincent Ambo <Vincent Ambo> | 2020-01-11T23·36+0000 |
|---|---|---|
| committer | Vincent Ambo <Vincent Ambo> | 2020-01-11T23·40+0000 |
| commit | 7ef0d62730840ded097b524104cc0a0904591a63 (patch) | |
| tree | a670f96103667aeca4789a95d94ca0dff550c4ce /third_party/git/Documentation/sequencer.txt | |
| parent | 6a2a3007077818e24a3d56fc492ada9206a10cf0 (diff) | |
| parent | 1b593e1ea4d2af0f6444d9a7788d5d99abd6fde5 (diff) | |
merge(third_party/git): Merge squashed git subtree at v2.23.0 r/373
Merge commit '1b593e1ea4d2af0f6444d9a7788d5d99abd6fde5' as 'third_party/git'
Diffstat (limited to 'third_party/git/Documentation/sequencer.txt')
| -rw-r--r-- | third_party/git/Documentation/sequencer.txt | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/third_party/git/Documentation/sequencer.txt b/third_party/git/Documentation/sequencer.txt new file mode 100644 index 000000000000..3bceb5647411 --- /dev/null +++ b/third_party/git/Documentation/sequencer.txt @@ -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. |