diff options
author | Vincent van Ravesteijn <vfr@lyx.org> | 2012-05-24 13:57:26 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-05-29 11:44:14 -0700 |
commit | 8a6dae108eadbd2882296981e03fd8e251d42f56 (patch) | |
tree | ef1aa4cdca49d738c7bb80cb86e9384f00611e1a | |
parent | Git 1.7.11-rc0 (diff) | |
download | tgif-8a6dae108eadbd2882296981e03fd8e251d42f56.tar.xz |
Do not autosquash in case of an implied interactive rebase
The option to autosquash is only used in case of an interactive rebase.
When merges are preserved, rebase uses an interactive rebase internally,
but in this case autosquash should still be disabled.
Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-x | git-rebase.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 24a2840033..9148ec25c1 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -167,6 +167,7 @@ run_specific_rebase () { if [ "$interactive_rebase" = implied ]; then GIT_EDITOR=: export GIT_EDITOR + autosquash= fi . git-rebase--$type } |