From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 5 Oct 2015 19:30:21 +0000 (-0700)
Subject: Merge branch 'jk/rebase-no-autostash'
X-Git-Tag: v2.7.0-rc0~134
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6560584494a8053431d0c8e90b78d50f71c8055b?hp=--cc

Merge branch 'jk/rebase-no-autostash'

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
---

6560584494a8053431d0c8e90b78d50f71c8055b
diff --cc Documentation/git-rebase.txt
index ca039546a4,73cba04887..72e69fc165
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@@ -429,10 -414,11 +429,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