Merge branch 'sr/force-rebase'

diff --git a/git-rebase.sh b/git-rebase.sh
index 5d9a393c38c9058f468809951a6237d41126ac23..c2a9b1fbe05499af32d25750498b244bc0597592 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -319,6 +319,7 @@ do
        esac
        shift
 done
+test $# -gt 2 && usage
 
 # Make sure we do not have $GIT_DIR/rebase-apply
 if test -z "$do_merge"