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>
Jay Soffian committed
Feb 18, 2009 at 08:44 UTC
51b2ead03c8cdc0ddeeca2fb5db14b7bac584337
2 files changed
+6
git-pull.sh
+5
@@ -171,6 +171,11 @@ case "$merge_head" in
171
echo >&2 "Cannot merge multiple branches into empty head"
172
exit 1
173
fi
174
+ if test true = "$rebase"
175
+ then
176
+ echo >&2 "Cannot rebase onto multiple branches"
177
+ exit 1
178
+ fi
179
;;
180
esac
181
git-rebase.sh
+1
@@ -310,6 +310,7 @@ do
310
esac
311
shift
312
done
313
+test $# -gt 2 && usage
314
315
# Make sure we do not have $GIT_DIR/rebase-apply
316
if test -z "$do_merge"