undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase --root: stop assuming squash_onto is unset

Browse Source 
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>
This commit is contained in:
Phillip Wood 2018-03-20 10:03:13 +00:00 committed by Junio C Hamano
parent 38e79b1fda
commit bb2ac4fcac
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
git-rebase.sh
View File

@ -60,6 +60,7 @@ $(gettext 'Resolve all conflicts manually, mark them as resolved with
You can instead skip this commit: run "git rebase --skip". 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".') To abort and get back to the state before "git rebase", run "git rebase --abort".')
" "
squash_onto=
unset onto unset onto
unset restrict_revision unset restrict_revision
cmd= cmd=