diff options
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 |