diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-10-05 12:30:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-05 12:30:22 -0700 |
| commit | 6560584494a8053431d0c8e90b78d50f71c8055b (patch) | |
| tree | 58b98a1dfccd4cce516f15effaa77652cfe7dc05 /Documentation | |
| parent | Merge branch 'jk/make-findstring-makeflags-fix' (diff) | |
| parent | Documentation/git-rebase: fix --no-autostash formatting (diff) | |
| download | tgif-6560584494a8053431d0c8e90b78d50f71c8055b.tar.xz | |
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
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-rebase.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index ca039546a4..72e69fc165 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -432,7 +432,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 |