summaryrefslogtreecommitdiffstats
path: root/git
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2023-06-17 13:06:44 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2023-06-17 13:06:52 +0000
commit3df759c83159e624053967cca1bf4be715826b7d (patch)
tree2037f763e2367d6adc158e14173f6bc99487a2a8 /git
parentReleasing debian version 20221223-2. (diff)
downloadopen-infrastructure-service-tools-3df759c83159e624053967cca1bf4be715826b7d.tar.xz
open-infrastructure-service-tools-3df759c83159e624053967cca1bf4be715826b7d.zip
Merging upstream version 20221224.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'git')
-rwxr-xr-xgit/bin/git-pull-branches5
1 files changed, 5 insertions, 0 deletions
diff --git a/git/bin/git-pull-branches b/git/bin/git-pull-branches
index 9effa17..afa2e63 100755
--- a/git/bin/git-pull-branches
+++ b/git/bin/git-pull-branches
@@ -24,6 +24,10 @@ set -e
CURRENT_BRANCH="$(git branch --show-current)"
REMOTE_BRANCHES="$(git branch -r | awk '{ print $1 }')"
+# pull current branch
+git pull
+
+# pull remote branches
for REMOTE_BRANCH in ${REMOTE_BRANCHES}
do
BRANCH="$(echo "${REMOTE_BRANCH}" | cut -d/ -f 2-)"
@@ -43,6 +47,7 @@ do
fi
done
+# checkout current branch
if [ "$(git branch --show-current)" != "${CURRENT_BRANCH}" ]
then
git checkout "${CURRENT_BRANCH}"