Merge branch 'jk/blame-first-parent'

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index ca039546a463bee511ca3a1c7d301689fb56a412..72e69fc16541b4ac5404431fedacbbdc41164b67 100644 (file)
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -432,7 +432,8 @@ If the '--autosquash' option is enabled by default using the
 configuration variable `rebase.autoSquash`, this option can be
 used to override and disable this setting.
 
---[no-]autostash::
+--autostash::
+--no-autostash::
        Automatically create a temporary stash before the operation
        begins, and apply it after the operation ends.  This means
        that you can run rebase on a dirty worktree.  However, use