diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2017-02-22 20:42:46 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2017-02-22 20:42:46 -0300 |
| commit | ebeea9d9e1f0c45d6ee134543048c643bbe4ac0f (patch) | |
| tree | 2ae7d90507fdb338dd19fca7b2fab889caadd493 /inception | |
| parent | 08f4a2f517a31742d4085eca6f59ec0054036593 (diff) | |
| download | apps-ebeea9d9e1f0c45d6ee134543048c643bbe4ac0f.tar.gz apps-ebeea9d9e1f0c45d6ee134543048c643bbe4ac0f.tar.bz2 | |
Updates submodules on inception merge
Diffstat (limited to 'inception')
| -rwxr-xr-x | inception | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -83,5 +83,5 @@ elif [ "$1" == "version" ]; then elif [ "$1" == "fetch" ]; then ( cd $DIRNAME && git fetch --all && git log -n 1 --branches=origin/master ) elif [ "$1" == "merge" ]; then - ( cd $DIRNAME && git merge origin/master ) + ( cd $DIRNAME && git merge origin/master && git submodule update --init --recursive ) fi |