From d19f196fd5d8a719a4401122f1b7d7f8064de946 Mon Sep 17 00:00:00 2001 From: naskya Date: Mon, 6 Nov 2023 06:35:10 +0900 Subject: [PATCH] dev: no longer need to use --ipv4 for git pull --- update.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/update.sh b/update.sh index c62c805fb..e101391d2 100755 --- a/update.sh +++ b/update.sh @@ -46,8 +46,8 @@ say "Pulling changes from the remote repo..." running "git checkout -- package.json packages/backend/assets" git checkout -- package.json packages/backend/assets -running "git pull --ff --no-edit --autostash --strategy-option theirs --ipv4" -git pull --ff --no-edit --autostash --strategy-option theirs --ipv4 +running "git pull --ff --no-edit --autostash --strategy-option theirs" +git pull --ff --no-edit --autostash --strategy-option theirs NEW_COMMIT=$(git rev-parse --short HEAD) say "Pulled successfully! Now we're on \`${NEW_COMMIT}\`\n"