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@xxxxxxxxx> --- This time w/o breaking git rebase $UPSTREAM $BRANCH_TO_SWITCH_TO git-pull.sh | 5 +++++ git-rebase.sh | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/git-pull.sh b/git-pull.sh index 2c7f432..25adddf 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 5d9a393..c2a9b1f 100755 --- 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" -- 1.6.2.rc1.218.g1b4fab -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
