naskya/firefish
1
0
Fork 1
mirror of https://example.com synced 2024-11-22 22:06:40 +09:00
Code Issues Activity

dev: no longer need to use --ipv4 for git pull

Browse source
This commit is contained in:
naskya 2023-11-06 06:35:10 +09:00
parent 5c1c655957
commit d19f196fd5
Signed by: naskya
GPG key ID: 164DFF24E2D40139
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
update.sh
View file

@ -46,8 +46,8 @@ say "Pulling changes from the remote repo..."
running "git checkout -- package.json packages/backend/assets" running "git checkout -- package.json packages/backend/assets"
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" running "git pull --ff --no-edit --autostash --strategy-option theirs"
git pull --ff --no-edit --autostash --strategy-option theirs --ipv4 git pull --ff --no-edit --autostash --strategy-option theirs
NEW_COMMIT=$(git rev-parse --short HEAD) NEW_COMMIT=$(git rev-parse --short HEAD)
say "Pulled successfully! Now we're on \`${NEW_COMMIT}\`\n" say "Pulled successfully! Now we're on \`${NEW_COMMIT}\`\n"