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 <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Phillip Wood committed
Mar 20, 2018 at 10:03 UTC
bb2ac4fcacaf5044b44e2acb918da33a4cca6af1
1 file changed
+1
git-rebase.sh
+1
@@ -60,6 +60,7 @@ $(gettext 'Resolve all conflicts manually, mark them as resolved with
60
You can instead skip this commit: run "git rebase --skip".
61
To abort and get back to the state before "git rebase", run "git rebase --abort".')
62
"
63
+squash_onto=
64
unset onto
65
unset restrict_revision
66
cmd=