summaryrefslogtreecommitdiff
path: root/Documentation/sequencer.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/sequencer.txt')
-rw-r--r--Documentation/sequencer.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/sequencer.txt b/Documentation/sequencer.txt
index 16ce88ce6b..3e6df338be 100644
--- a/Documentation/sequencer.txt
+++ b/Documentation/sequencer.txt
@@ -2,3 +2,8 @@
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.