mirror of
https://github.com/Matir/skel.git
synced 2026-05-25 21:19:09 -07:00
Only FF when running pull from install script.
This commit is contained in:
@@ -337,7 +337,7 @@ install_dotfiles() {
|
|||||||
|
|
||||||
install_main() {
|
install_main() {
|
||||||
test -d ${BASEDIR}/.git && command -v git >/dev/null 2>&1 && \
|
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 && \
|
test $MINIMAL = 1 || command -v git >/dev/null 2>&1 && \
|
||||||
git -C ${BASEDIR} submodule update --init --recursive
|
git -C ${BASEDIR} submodule update --init --recursive
|
||||||
test $MINIMAL = 1 || prerequisites
|
test $MINIMAL = 1 || prerequisites
|
||||||
|
|||||||
Reference in New Issue
Block a user