[Bf-blender-cvs] [04e8a096622] master: GNUmakefile: add back 'git pull'

Campbell Barton noreply at git.blender.org
Fri Sep 29 10:50:01 CEST 2017


Commit: 04e8a096622cfb91b728fa48edbc1c31ced226c1
Author: Campbell Barton
Date:   Fri Sep 29 19:02:20 2017 +1000
Branches: master
https://developer.blender.org/rB04e8a096622cfb91b728fa48edbc1c31ced226c1

GNUmakefile: add back 'git pull'

Seems this was removed by accident.

===================================================================

M	GNUmakefile

===================================================================

diff --git a/GNUmakefile b/GNUmakefile
index f220e2f5e65..1143ac6e1f1 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -426,6 +426,7 @@ update: .FORCE
 		svn cleanup ../lib/* ; \
 		svn update ../lib/* ; \
 	fi
+	git pull --rebase
 	git submodule update --init --recursive
 	git submodule foreach git checkout master
 	git submodule foreach git pull --rebase origin master



More information about the Bf-blender-cvs mailing list