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 /GNUmakefile | |
| 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 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 2 |
1 files changed, 1 insertions, 1 deletions
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 # ----------------------------------------------------------------------------- |