X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=update-remotes;h=6fabc29a60439b086d47c6fbbb0b17e8e1c7e5db;hb=7024dc2389ef6f1f490e97502c246fb79813095d;hp=2eb9427fa531243a8a680c2b9fa5dc55a75ec870;hpb=684b1b0977c20fe1ffe172fc080854adc8031681;p=git-scripts.git diff --git a/update-remotes b/update-remotes index 2eb9427..6fabc29 100755 --- a/update-remotes +++ b/update-remotes @@ -16,7 +16,8 @@ elif [ -z "$current" ]; then exit 1 fi -{ git pull --ff-only current master || git reset --hard current/master } && +git fetch current && +{ git pull --ff-only current master || git reset --hard current/master ; } && web="`git config --get --path remote.web.url`" && if [ -n "$web" ]; then