misc: Fix the pull. it assumes that the remotes were added to the repository
This commit is contained in:
parent
a02827966d
commit
16c913c2ca
29
merge-all.sh
29
merge-all.sh
|
@ -1,15 +1,20 @@
|
|||
#!/bin/sh
|
||||
|
||||
git fetch git://gitorious.org/gnu-smalltalk-ports/petitparser.git && git merge -s subtree petitparser/ FETCH_HEAD
|
||||
git fetch git://gitorious.org/gnu-smalltalk-ports/petitparser-tests.git && git merge -s subtree=petitparser-tests FETCH_HEAD
|
||||
git fetch git://gitorious.org/gnu-smalltalk-ports/soapopera.git && git merge -s subtree=soapoper FETCH_HEAD
|
||||
git fetch git://git.osmocom.org/smalltalk/osmo-st-core && git merge -s subtree=osmo-st-core FETCH_HEAD
|
||||
git fetch git://git.osmocom.org/smalltalk/osmo-st-logging && git merge -s subtree=osmo-st-logging FETCH_HEAD
|
||||
git fetch git://git.osmocom.org/smalltalk/osmo-st-network && git merge -s subtree=osmo-st-network FETCH_HEAD
|
||||
git fetch git://git.osmocom.org/smalltalk/osmo-st-mgcp && git merge -s subtree=osmo-st-mgcp FETCH_HEAD
|
||||
git fetch git://git.osmocom.org/smalltalk/osmo-st-asn1 && git merge -s subtree=osmo-st-asn1 FETCH_HEAD
|
||||
git fetch git://git.osmocom.org/smalltalk/osmo-st-gsm && git merge -s subtree=osmo-st-gsm FETCH_HEAD
|
||||
git fetch git://git.osmocom.org/smalltalk/osmo-st-msc && git merge -s subtree=osmo-st-msc FETCH_HEAD
|
||||
git fetch git://git.osmocom.org/smalltalk/osmo-st-sip && git merge -s subtree=osmo-st-sip FETCH_HEAD
|
||||
git fetch git://git.osmocom.org/smalltalk/osmo-st-testphone && git merge -s subtree=osmo-st-testphone FETCH_HEAD
|
||||
merge()
|
||||
{
|
||||
git pull -s subtree $1 master
|
||||
}
|
||||
|
||||
merge petitparser
|
||||
merge petitparser-tests
|
||||
merge soapopera
|
||||
merge osmo-st-core
|
||||
merge osmo-st-logging
|
||||
merge osmo-st-network
|
||||
merge osmo-st-mgcp
|
||||
merge osmo-st-asn1
|
||||
merge osmo-st-gsm
|
||||
merge osmo-st-msc
|
||||
merge osmo-st-sip
|
||||
merge osmo-st-testphone
|
||||
|
||||
|
|
Reference in New Issue