merge: Work on the init..
This commit is contained in:
parent
b96b0d2d93
commit
65bcdcb12b
|
@ -4,11 +4,7 @@
|
||||||
merge()
|
merge()
|
||||||
{
|
{
|
||||||
echo $1
|
echo $1
|
||||||
git remote add -f $1 $2
|
git subtree add --prefix=$1 rem-$1/master
|
||||||
git merge -s ours --no-commit $1/master
|
|
||||||
git read-tree --prefix=$1/ -u $1/master
|
|
||||||
git commit
|
|
||||||
git pull -s subtree $1 master
|
|
||||||
}
|
}
|
||||||
|
|
||||||
merge osmo-st-core git://git.osmocom.org/smalltalk/osmo-st-core
|
merge osmo-st-core git://git.osmocom.org/smalltalk/osmo-st-core
|
||||||
|
|
Reference in New Issue