diff options
author | Jonas Smedegaard <dr@jones.dk> | 2008-06-14 13:25:45 +0200 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2008-06-14 13:25:45 +0200 |
commit | 84d7ec94513943eb534f44555e5f7c3e700b0a01 (patch) | |
tree | 9927efd44e14663fd3e98d866d10c42854b3f3aa /make/git.mk | |
parent | 1da62670810ccb26988c676982ab29d3f407183f (diff) |
Let git init target do init (we don't use it anyway currently).
Diffstat (limited to 'make/git.mk')
-rw-r--r-- | make/git.mk | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/make/git.mk b/make/git.mk index 068e7f3..0059448 100644 --- a/make/git.mk +++ b/make/git.mk @@ -17,13 +17,9 @@ update: $(if $(noncurrentbranches),$(foreach branch,$(noncurrentbranches),git branch -f "$(branch)" "$(origin)/$(branch)" && git checkout "$(branch)" && git merge --no-commit "$(origin)" &&) git checkout "$(master)") init: -# Assume that initial cloning is done already when invoking this target -# git init -# git remote add -f -t "$(master)" -m "$(master)" origin "$(origin)" -# git merge origin + git init + git remote add -f -m "$(master)" origin "$(origin)" + git merge origin # git config remote.origin.push +"refs/heads/$(master)":"refs/heads/$(master)" - $(if $(filter $(currentbranch),$(master)),,git branch -f "$(master)" "$(origin)/$(master)") - $(if $(noncurrentbranches),$(foreach branch,$(noncurrentbranches),git branch -f "$(branch)" "$(origin)/$(branch)" &&) true) - $(if $(filter $(currentbranch),$(master)),,git checkout -f "$(master)") .PHONY: update init |