X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=fork;h=2a537b483b87c5d4d0079fcf465918531fdbaa01;hb=d2285ab979176bcccc9162b0ad3f23a631c44ff5;hp=7782b8977b71eef17f2e8816f003f7b134b6da74;hpb=3d0fe69fdf2edb7c5b363711990f2d638cbc9ae7;p=git-scripts.git diff --git a/fork b/fork index 7782b89..2a537b4 100755 --- a/fork +++ b/fork @@ -19,12 +19,13 @@ if [ -d .git ]; then else git clone -o upstream "$upstream" "$local_repo" && cd "$local_repo" && - pwd >> "`dirname \"$0\"`"/locate-all.list && + chmod a-x .git/config && git remote add origin "$origin" fi && -chmod a-x .git/config && -branch="`git rev-parse --abbrev-ref HEAD`" +"`dirname \"$0\"`"/set-commit-date-recursive && +pwd >> "`dirname \"$0\"`"/locate-all.list && +branch="`git rev-parse --abbrev-ref HEAD`" && git pull upstream $branch && git pull origin $branch &&