git://git.jankratochvil.net
/
nethome.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
52c2e88
)
Include gdb_7_1-branch.
author
jkratoch
<>
Fri, 26 Feb 2010 22:17:56 +0000
(22:17 +0000)
committer
jkratoch
<>
Fri, 26 Feb 2010 22:17:56 +0000
(22:17 +0000)
bin/master-UPDATE
patch
|
blob
|
history
diff --git
a/bin/master-UPDATE
b/bin/master-UPDATE
index
5c484a6
..
276e099
100755
(executable)
--- 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