merge: Start to use git-subtree again the subtree merge is broken
I am struggling with not everything being merged properly..
This commit is contained in:
parent
348d52c79c
commit
3794dfe753
|
@ -2,7 +2,7 @@
|
|||
|
||||
merge()
|
||||
{
|
||||
git pull -s subtree $1 master
|
||||
git subtree pull --prefix=$1 rem-$1 master
|
||||
}
|
||||
|
||||
merge petitparser
|
||||
|
|
|
@ -0,0 +1,24 @@
|
|||
#!/bin/sh
|
||||
|
||||
|
||||
init()
|
||||
{
|
||||
echo $1
|
||||
git remote add -f rem-$1 $2
|
||||
}
|
||||
|
||||
init osmo-st-core git://git.osmocom.org/smalltalk/osmo-st-core
|
||||
init osmo-st-logging git://git.osmocom.org/smalltalk/osmo-st-logging
|
||||
init osmo-st-network git://git.osmocom.org/smalltalk/osmo-st-network
|
||||
init osmo-st-mgcp git://git.osmocom.org/smalltalk/osmo-st-mgcp
|
||||
init osmo-st-asn1 git://git.osmocom.org/smalltalk/osmo-st-asn1
|
||||
init osmo-st-gsm git://git.osmocom.org/smalltalk/osmo-st-gsm
|
||||
init osmo-st-msc git://git.osmocom.org/smalltalk/osmo-st-msc
|
||||
init osmo-st-sip git://git.osmocom.org/smalltalk/osmo-st-sip
|
||||
init osmo-st-testphone git://git.osmocom.org/smalltalk/osmo-st-testphone
|
||||
init petitparser git://gitorious.org/gnu-smalltalk-ports/petitparser
|
||||
init petitparser-tests git://gitorious.org/gnu-smalltalk-ports/petitparser-tests.git
|
||||
init soapopera git://gitorious.org/gnu-smalltalk-ports/soapopera.git
|
||||
init osmo-st-openbsc-test git://git.osmocom.org/smalltalk/osmo-st-openbsc-test
|
||||
init iliad-stable git://github.com/NicolasPetton/iliad-stable.git
|
||||
init grease git://github.com/NicolasPetton/Grease.git
|
Reference in New Issue