summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-12-08 14:05:00 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-12-08 14:05:01 -0800
commit697bd2871cd04357ced89b962d39eb685dab47ca (patch)
tree05a5149048de941a465151fa6e4488b65a319f4e /Documentation
parentPrepare for 2.6.4 (diff)
parentDocumentation/git-rebase: fix --no-autostash formatting (diff)
downloadtgif-697bd2871cd04357ced89b962d39eb685dab47ca.tar.xz
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
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-rebase.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index bccfdf7fde..6cca8bb51d 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -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