git://git.jankratochvil.net
/
nethome.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switch to FSF GCC 4.7.
[nethome.git]
/
bin
/
master-UPDATE
diff --git
a/bin/master-UPDATE
b/bin/master-UPDATE
index
5c484a6
..
4accf89
100755
(executable)
--- a/
bin/master-UPDATE
+++ b/
bin/master-UPDATE
@@
-1,9
+1,11
@@
#! /bin/bash
set -ex
#! /bin/bash
set -ex
-git pull origin
-git checkout master
-[ "`git status|head -n1`" = "# On branch master" ]
git fetch gdb
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
echo OK