diff options
| -rwxr-xr-x | git-pull.sh | 5 | ||||
| -rwxr-xr-x | git-rebase.sh | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/git-pull.sh b/git-pull.sh index 2c7f432dc0..25adddfddf 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -171,6 +171,11 @@ case "$merge_head" in echo >&2 "Cannot merge multiple branches into empty head" exit 1 fi + if test true = "$rebase" + then + echo >&2 "Cannot rebase onto multiple branches" + exit 1 + fi ;; esac diff --git a/git-rebase.sh b/git-rebase.sh index 6d3eddbada..368c0ef434 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" |