diff options
| author | Daniel Willmann <dwillmann@sysmocom.de> | 2018-02-02 17:09:59 +0100 |
|---|---|---|
| committer | Daniel Willmann <dwillmann@sysmocom.de> | 2018-02-06 16:04:04 +0100 |
| commit | 12984ef36d19b01f6ed278af8173819337ccc365 (patch) | |
| tree | 799f52248da879f06e678500242c7a666ce9081f | |
| parent | 9dadc522d70908a9739b41087ccb9475c88c99a2 (diff) | |
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
| -rw-r--r-- | deps/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
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: |