From: Junio C Hamano Date: Tue, 8 Dec 2015 22:05:00 +0000 (-0800) Subject: Merge branch 'jk/rebase-no-autostash' into maint X-Git-Tag: v2.6.4~5 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/697bd2871cd04357ced89b962d39eb685dab47ca 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 --- 697bd2871cd04357ced89b962d39eb685dab47ca diff --cc Documentation/git-rebase.txt index bccfdf7fde,73cba04887..6cca8bb51d --- a/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