diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 09:49:36 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 09:49:36 +0000 |
| commit | 5ec6074f0633939fd17d94111d10c6c6b062978c (patch) | |
| tree | bfaa17b5a64abc66c918e9c70969e519d9e1df8e /Documentation/sequencer.txt | |
| parent | Initial commit. (diff) | |
| download | git-5ec6074f0633939fd17d94111d10c6c6b062978c.tar.xz git-5ec6074f0633939fd17d94111d10c6c6b062978c.zip | |
Adding upstream version 1:2.30.2.upstream/1%2.30.2upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'Documentation/sequencer.txt')
| -rw-r--r-- | Documentation/sequencer.txt | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/Documentation/sequencer.txt b/Documentation/sequencer.txt new file mode 100644 index 0000000..3bceb56 --- /dev/null +++ b/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. |