Merge branch 'jc/maint-strbuf-add-fix-doubling'

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 9b648ece6e6fbd1371cf8802a9a312e2e4473542..e2e61d36420fd1e54c20f50bfcc724e1bf078017 100644 (file)
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -308,6 +308,16 @@ which makes little sense.
        root commits will be rewritten to have <newbase> as parent
        instead.
 
+--autosquash::
+       When the commit log message begins with "squash! ..." (or
+       "fixup! ..."), and there is a commit whose title begins with
+       the same ..., automatically modify the todo list of rebase -i
+       so that the commit marked for quashing come right after the
+       commit to be modified, and change the action of the moved
+       commit from `pick` to `squash` (or `fixup`).
++
+This option is only valid when '--interactive' option is used.
+
 include::merge-strategies.txt[]
 
 NOTES