diff options
| -rw-r--r-- | .gitmodules | 4 | ||||
| -rw-r--r-- | GNUmakefile | 2 | ||||
| -rw-r--r-- | make.bat | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index 0b8228e3f14..02875320630 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,16 +1,20 @@ [submodule "release/scripts/addons"] path = release/scripts/addons url = ../blender-addons.git + branch = blender2.8 ignore = all [submodule "release/scripts/addons_contrib"] path = release/scripts/addons_contrib url = ../blender-addons-contrib.git + branch = master ignore = all [submodule "release/datafiles/locale"] path = release/datafiles/locale url = ../blender-translations.git + branch = master ignore = all [submodule "source/tools"] path = source/tools url = ../blender-dev-tools.git + branch = master ignore = all diff --git a/GNUmakefile b/GNUmakefile index 1fda1a25a92..8fa9571dca6 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -402,7 +402,7 @@ update: .FORCE svn update ../lib/* ; \ fi git pull --rebase - git submodule foreach git pull --rebase origin master + git submodule update --remote # ----------------------------------------------------------------------------- @@ -90,7 +90,7 @@ if NOT "%1" == "" ( ) else if "%1" == "update" ( svn up ../lib/* git pull --rebase - git submodule foreach git pull --rebase origin master + git submodule update --remote goto EOF ) else if "%1" == "clean" ( set MUST_CLEAN=1 |