From: jkratoch <> Date: Fri, 26 Feb 2010 22:17:56 +0000 (+0000) Subject: Include gdb_7_1-branch. X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=commitdiff_plain;h=bbb1e712dd2f1393dec4e3c8f01cb020702e330c;ds=sidebyside Include gdb_7_1-branch. --- 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