From eb5095b909c3771e9c7dd2054d51276c38795707 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 25 Jun 2022 15:25:10 +0200 Subject: [PATCH] "a" will pull --all MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- pull-stick.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pull-stick.sh b/pull-stick.sh index f1f16dd..3170929 100755 --- a/pull-stick.sh +++ b/pull-stick.sh @@ -27,15 +27,19 @@ for project in ${LIST}; do fi echo "$0: Pulling '${project}' ..." - - git pull -S origin master - git fetch upstream - git fetch transport + if [ "$1" = "a" ] + then + git pull --all + else + git pull -S origin master + git fetch upstream + git fetch transport + fi echo "$0: Merging upstream into '${project}' ..." git merge -S upstream/master - if [ "$1" != "s" ] + if [ "$1" != "s" -a "$1" != "a" ] then echo "$0: Rebasing '${project}' ..." git rebase -Sm origin/master || exit 255 -- 2.39.5