From: Oleg Broytman Date: Fri, 16 Apr 2021 14:24:36 +0000 (+0300) Subject: Feat(pull-usrlocalsrc): Pull branch `main`, merge into local `master` X-Git-Url: https://git.phdru.name/?p=git-scripts.git;a=commitdiff_plain;h=d5edda00cd5b8ecd8ca9b3b38654b25176beb3cb Feat(pull-usrlocalsrc): Pull branch `main`, merge into local `master` SJW shit. --- diff --git a/pull-usrlocalsrc b/pull-usrlocalsrc index 1413803..ef9167b 100755 --- a/pull-usrlocalsrc +++ b/pull-usrlocalsrc @@ -10,7 +10,8 @@ cat "$prog_dir"/locate-all.list | grep -F /usr/local/src | while read d; do echo "----- $d -----"; cd "$d" && if has_remote upstream && has_remote origin; then - git pull upstream master && git push origin master || exit 1 + { git pull upstream master || git pull upstream main:master; } && + git push origin master || exit 1 elif has_remote origin; then git pull origin master || exit 1 fi