Merge branch 'bk/submodule-in-recursive-merge'

diff --git a/Documentation/sequencer.txt b/Documentation/sequencer.txt
index 16ce88ce6b4eda27a2c91e01f3053b478d7cde93..3e6df338bed519eb74cf233f40589ddbfb0da57b 100644 (file)
--- 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.