X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-rebase.sh;h=368c0ef4342df990a5617fd6fbe2cd973b1b208b;hb=3db964b551827e25f897cc75ffd8e520ee8b48cd;hp=6d3eddbada5e1a5a38e2b909c75909b8e9d5fda8;hpb=df487baa30924a36ade38ada4f77379236dcce0f;p=git.git diff --git a/git-rebase.sh b/git-rebase.sh index 6d3eddbad..368c0ef43 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -310,6 +310,7 @@ do esac shift done +test $# -gt 2 && usage # Make sure we do not have $GIT_DIR/rebase-apply if test -z "$do_merge"