diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-12-20 16:45:55 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-12-21 14:15:21 +0300 |
| commit | c9df453ce70bdf36a4567f8a97b977c1f5e6dfd7 (patch) | |
| tree | d32e802384bedc0db5792e5d594dfbb1296a6ad3 /GNUmakefile | |
| parent | 4f6b4ceb6cb070459e7d247d2ce02076a76494bb (diff) | |
Update for moving blender2.8 to master.
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/GNUmakefile b/GNUmakefile index f692daed600..21183220b80 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -458,9 +458,8 @@ update: .FORCE fi git pull --rebase git submodule update --init --recursive - # Use blender2.8 branch for submodules that have it. - git submodule foreach "git checkout blender2.8 || git checkout master" - git submodule foreach git pull --rebase origin + git submodule foreach git checkout master + git submodule foreach git pull --rebase origin master # ----------------------------------------------------------------------------- |