Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
rebase --root: stop assuming squash_onto is unset
[gitweb.git]
/
git-rebase.sh
diff --git
a/git-rebase.sh
b/git-rebase.sh
index fd72a35c65b43537b292445b87ffb7e682cc076a..8b1b892d72853b4256dd864637ccf44376350dff 100755
(executable)
--- 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=