diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2018-03-20 10:03:13 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-20 10:17:39 -0700 |
| commit | bb2ac4fcacaf5044b44e2acb918da33a4cca6af1 (patch) | |
| tree | 5a3e290cec6d2a84f472a3f4ec80353c6c56153d | |
| parent | 38e79b1fdab9244e1727d0698afcf3bb8956c0a4 (diff) | |
| download | git-bb2ac4fcacaf5044b44e2acb918da33a4cca6af1.tar.gz | |
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>
| -rwxr-xr-x | git-rebase.sh | 1 |
1 files changed, 1 insertions, 0 deletions
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= |