Only FF when running pull from install script.

This commit is contained in:
David Tomaschik
2020-03-30 15:49:03 -07:00
parent c7c97b84c5
commit 8225785dcc

View File

@@ -337,7 +337,7 @@ install_dotfiles() {
install_main() {
test -d ${BASEDIR}/.git && command -v git >/dev/null 2>&1 && \
git -C ${BASEDIR} pull
git -C ${BASEDIR} pull --ff-only
test $MINIMAL = 1 || command -v git >/dev/null 2>&1 && \
git -C ${BASEDIR} submodule update --init --recursive
test $MINIMAL = 1 || prerequisites