smalltalk
/
osmo-st-all
Archived
1
0
Fork 0
Code Releases Activity

merge: Work on the init..

This commit is contained in:
Holger Hans Peter Freyther 2014-06-04 15:44:52 +02:00
parent b96b0d2d93
commit 65bcdcb12b
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
merge-init.sh
View File

@ -4,11 +4,7 @@
merge()
{
echo $1
git remote add -f $1 $2
git merge -s ours --no-commit $1/master
git read-tree --prefix=$1/ -u $1/master
git commit
git pull -s subtree $1 master
git subtree add --prefix=$1 rem-$1/master
}
merge osmo-st-core git://git.osmocom.org/smalltalk/osmo-st-core