diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-12-20 16:42:01 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-12-21 14:01:05 +0300 |
| commit | e72f989cf49132c94be139705baf78228bea5d7b (patch) | |
| tree | ede964c3d4ed1f99f0981287d1dd157eb4b31138 /GNUmakefile | |
| parent | b52465bd32def94daa2113c308d78433eac6c628 (diff) | |
Update for moving master to blender2.7 branch.
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/GNUmakefile b/GNUmakefile index 02e081e03df..d31abe66f37 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -445,8 +445,9 @@ update: .FORCE fi git pull --rebase git submodule update --init --recursive - git submodule foreach git checkout master - git submodule foreach git pull --rebase origin master + # Use blender2.7 branch for submodules that have it. + git submodule foreach "git checkout blender2.7 || git checkout master" + git submodule foreach git pull --rebase origin # ----------------------------------------------------------------------------- |