diff options
| author | Jay Soffian <jaysoffian@gmail.com> | 2009-02-18 08:44:02 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-18 11:14:04 -0800 |
| commit | 51b2ead03c8cdc0ddeeca2fb5db14b7bac584337 (patch) | |
| tree | d028da3376e47d1537518dfa27b8aee4887ed36e /git-rebase.sh | |
| parent | git-svn: fix parsing of timestamp obtained from svn (diff) | |
| download | git-51b2ead03c8cdc0ddeeca2fb5db14b7bac584337.tar.gz git-51b2ead03c8cdc0ddeeca2fb5db14b7bac584337.zip | |
disallow providing multiple upstream branches to rebase, pull --rebase
It does not make sense to provide multiple upstream branches to either
git pull --rebase, or to git rebase, so disallow both.
Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 1 |
1 files changed, 1 insertions, 0 deletions
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" |