From 12984ef36d19b01f6ed278af8173819337ccc365 Mon Sep 17 00:00:00 2001 From: Daniel Willmann Date: Fri, 2 Feb 2018 17:09:59 +0100 Subject: deps: Ensure that branches are updated on make update as well Don't just force-checkout the local master branch again, but reset to origin/master Change-Id: I7d5e0e3d7f92fc51fa438b92f00c79f63945e74f --- deps/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/Makefile b/deps/Makefile index e1cbfe34..6f975f20 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -55,7 +55,7 @@ $(1): .PHONY:$(1)/update $(1)/update: $(1) - (cd $(1) && git fetch && git checkout -f -B master) + (cd $(1) && git fetch && git checkout -f -B master origin/master) .PHONY: $(1)/clean $(1)/clean: -- cgit v1.2.3