Merge branch 'pw/rebase-keep-empty-fixes' into pw/rebase-signoff

diff --git a/git-rebase.sh b/git-rebase.sh
index fd72a35c65b43537b292445b87ffb7e682cc076a..37b8f13971d424f9bf4b45b5f539f036388fcb30 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=
@@ -262,6 +263,9 @@ do
        --keep-empty)
                keep_empty=yes
                ;;
+       --no-keep-empty)
+               keep_empty=
+               ;;
        --preserve-merges)
                preserve_merges=t
                test -z "$interactive_rebase" && interactive_rebase=implied