From c8bae7493d2f2910b57f13ded012e86bdcfb0532 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 16:47:53 +0200 Subject: Adding upstream version 1:2.39.2. Signed-off-by: Daniel Baumann --- Documentation/sequencer.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 Documentation/sequencer.txt (limited to 'Documentation/sequencer.txt') 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. -- cgit v1.2.3