X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=bin%2Fmaster-UPDATE;h=4accf89858441dcc8e5fba76b34387851843c9f2;hp=5c484a6f10ee694d4382cf0f31f701f526a205a1;hb=b8be1b96db19decef6b6b1de6115aa7c5b50bb18;hpb=816e5911d4f26a0c3d69eae262023c53ebe6950d diff --git a/bin/master-UPDATE b/bin/master-UPDATE index 5c484a6..4accf89 100755 --- a/bin/master-UPDATE +++ b/bin/master-UPDATE @@ -1,9 +1,11 @@ #! /bin/bash set -ex -git pull origin -git checkout master -[ "`git status|head -n1`" = "# On branch master" ] git fetch gdb -git merge gdb/master -git push origin master +for i in master gdb_7_2-branch;do # gdb_7_1-branch + git checkout $i + [ "`git status|head -n1`" = "# On branch $i" ] + git pull origin + git merge gdb/$i + git push origin $i +done echo OK