Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent van Ravesteijn <vfr@lyx.org>2012-05-24 17:57:26 +0400
committerJunio C Hamano <gitster@pobox.com>2012-06-18 01:01:42 +0400
commit941cab3a78a3fd3d21ba3acb3f8da3407a692015 (patch)
tree749c3eec1e754e46584fa4b9e164b92554e1cecd
parentca4effd8bce5e0dfce7ce1425074475c8643b7f0 (diff)
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-xgit-rebase.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index 03f73da887..ede9723327 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -165,6 +165,7 @@ run_specific_rebase () {
if [ "$interactive_rebase" = implied ]; then
GIT_EDITOR=:
export GIT_EDITOR
+ autosquash=
fi
. git-rebase--$type
}