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
This commit is contained in:
@ -434,7 +434,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
|
||||
|
Reference in New Issue
Block a user