diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-02-20 12:16:58 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-02-20 12:16:58 +0300 |
| commit | 86d8dc12c10421cc3782619e0528d83f934385ea (patch) | |
| tree | 6918a3702d81cab7b27c9da1bea67662b5297ce8 /.gitmodules | |
| parent | 22119f976e910293904b29f220ec144e7ab7a7ff (diff) | |
Use Git submodule tracking feature
This way we can point submodules to different branches.
There are two side-effects to this:
- Git 1.8.2 becomes the minimal required version now
to support this feature.
- Not sure how doing local changes in submodules followed
by `make update` will behave. We don't use explicit rebase
now.
Perhaps this is not so bad, since it was already quite
dangerous thing to do.
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 4 |
1 files changed, 4 insertions, 0 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 |