]> git.ipfire.org Git - thirdparty/git.git/commit - git-legacy-rebase.sh
rebase --root: stop assuming squash_onto is unset
authorPhillip Wood <phillip.wood@dunelm.org.uk>
Tue, 20 Mar 2018 10:03:13 +0000 (10:03 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Mar 2018 17:17:39 +0000 (10:17 -0700)
commitbb2ac4fcacaf5044b44e2acb918da33a4cca6af1
tree5a3e290cec6d2a84f472a3f4ec80353c6c56153d
parent38e79b1fdab9244e1727d0698afcf3bb8956c0a4
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>
git-rebase.sh