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-pull.sh | |
| parent | b94ead75945fe7dbe8fbfeb48070a6b54d02e318 (diff) | |
| download | git-51b2ead03c8cdc0ddeeca2fb5db14b7bac584337.tar.gz | |
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-pull.sh')
| -rwxr-xr-x | git-pull.sh | 5 |
1 files changed, 5 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 |