summaryrefslogtreecommitdiff
path: root/make/git.mk
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-08-04 04:23:57 +0200
committerJonas Smedegaard <dr@jones.dk>2008-08-04 04:23:57 +0200
commit4f4519b1f9a02744004f0bd547675a3ece891f93 (patch)
tree2f571ccf9c1bf96a03aa5f8c21f66a6e760973b4 /make/git.mk
parent52d3706fd4d7ba3425dac767d75db549fb499dc7 (diff)
Use git pull (not merge).
Diffstat (limited to 'make/git.mk')
-rw-r--r--make/git.mk4
1 files 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