From bb2ac4fcacaf5044b44e2acb918da33a4cca6af1 Mon Sep 17 00:00:00 2001 From: Phillip Wood Date: Tue, 20 Mar 2018 10:03:13 +0000 Subject: [PATCH] rebase --root: stop assuming squash_onto is unset If the user set the environment variable 'squash_onto', the 'rebase' command would erroneously assume that the user passed the option '--root'. Signed-off-by: Phillip Wood Signed-off-by: Junio C Hamano --- git-rebase.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/git-rebase.sh b/git-rebase.sh index fd72a35c65..8b1b892d72 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -60,6 +60,7 @@ $(gettext 'Resolve all conflicts manually, mark them as resolved with You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort".') " +squash_onto= unset onto unset restrict_revision cmd=