зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
b94ead7594
Коммит
51b2ead03c
|
@ -171,6 +171,11 @@ case "$merge_head" in
|
||||||
echo >&2 "Cannot merge multiple branches into empty head"
|
echo >&2 "Cannot merge multiple branches into empty head"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
if test true = "$rebase"
|
||||||
|
then
|
||||||
|
echo >&2 "Cannot rebase onto multiple branches"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|
|
@ -310,6 +310,7 @@ do
|
||||||
esac
|
esac
|
||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
|
test $# -gt 2 && usage
|
||||||
|
|
||||||
# Make sure we do not have $GIT_DIR/rebase-apply
|
# Make sure we do not have $GIT_DIR/rebase-apply
|
||||||
if test -z "$do_merge"
|
if test -z "$do_merge"
|
||||||
|
|
Загрузка…
Ссылка в новой задаче