From 4f4519b1f9a02744004f0bd547675a3ece891f93 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Mon, 4 Aug 2008 04:23:57 +0200 Subject: Use git pull (not merge). --- make/git.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make/git.mk b/make/git.mk index 0059448..072617e 100644 --- a/make/git.mk +++ b/make/git.mk @@ -13,8 +13,8 @@ noncurrentbranches = $(filter-out $(currentbranch),$(branches)) update: git fetch $(origin) $(if $(filter $(currentbranch),$(master)),,git branch -f "$(master)" "$(origin)/$(master)" && git checkout "$(master)") - git merge --no-commit "$(origin)" - $(if $(noncurrentbranches),$(foreach branch,$(noncurrentbranches),git branch -f "$(branch)" "$(origin)/$(branch)" && git checkout "$(branch)" && git merge --no-commit "$(origin)" &&) git checkout "$(master)") + git pull "$(origin)" + $(if $(noncurrentbranches),$(foreach branch,$(noncurrentbranches),git branch -f "$(branch)" "$(origin)/$(branch)" && git checkout "$(branch)" && git pull "$(origin)" &&) git checkout "$(master)") init: git init -- cgit v1.2.3