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 /git-rebase.sh | |
| parent | 96090283e0ba646c599b6a15834bdbb8dd731b4a (diff) | |
| parent | 82e0668cde032379095b0581609c73646e9eb92a (diff) | |
| download | git-6560584494a8053431d0c8e90b78d50f71c8055b.tar.gz git-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 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 1757404bc..af7ba5fd9 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -14,7 +14,7 @@ git-rebase --continue | --abort | --skip | --edit-todo Available options are v,verbose! display a diffstat of what changed upstream q,quiet! be quiet. implies --no-stat -autostash! automatically stash/stash pop before and after +autostash automatically stash/stash pop before and after fork-point use 'merge-base --fork-point' to refine upstream onto=! rebase onto given branch instead of upstream p,preserve-merges! try to recreate merges instead of ignoring them @@ -292,6 +292,9 @@ do --autostash) autostash=true ;; + --no-autostash) + autostash=false + ;; --verbose) verbose=t diffstat=t |