Merge branch 'jk/rebase-no-autostash' into maint

There was no way to defeat a configured rebase.autostash variable
from the command line, as "git rebase --no-autostash" was missing.

* jk/rebase-no-autostash:
  Documentation/git-rebase: fix --no-autostash formatting
  rebase: support --no-autostash

diff --cc Documentation/git-rebase.txt
index bccfdf7fde9af8c80203f85d98030f8f38db4994,73cba04887cb9896dea9c1f852206b8c88f219d8..6cca8bb51dcabd47474ad63d908d7ec5d06d8703
--- 1/Documentation/git-rebase.txt
--- 2/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@@ -431,10 -414,11 +431,11 @@@ squash/fixup series
  This option is only valid when the '--interactive' option is used.
  +
  If the '--autosquash' option is enabled by default using the
 -configuration variable `rebase.autosquash`, this option can be
 +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

diff --cc git-rebase.sh
Simple merge