X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=bin%2Fmaster-UPDATE;fp=bin%2Fmaster-UPDATE;h=276e099fe8e099d29b31ab204844ca4e9e0e9101;hp=5c484a6f10ee694d4382cf0f31f701f526a205a1;hb=bbb1e712dd2f1393dec4e3c8f01cb020702e330c;hpb=52c2e88aa829bfe2b66dde5225c61df90829f67a diff --git a/bin/master-UPDATE b/bin/master-UPDATE index 5c484a6..276e099 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 gdb_7_1-branch master;do + git checkout $i + [ "`git status|head -n1`" = "# On branch $i" ] + git pull origin + git merge gdb/$i + git push origin $i +done echo OK