From d6d56043cea5fde47c46a62fa7555117af376f0b Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 9 Jul 2013 17:28:24 +0200 Subject: [PATCH] fix git-branch-merge Signed-off-by: Nico Schottelius --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c10b92bb..7064b364 100644 --- a/Makefile +++ b/Makefile @@ -187,9 +187,8 @@ $(GIT_TAG_FILE): @printf "Enter tag description for $(CHANGELOG_VERSION)> " @read tagmessage; git tag "$(CHANGELOG_VERSION)" -m "$$tagmessage" -#git-branch-merge: git-tag git-branch-merge: - current=$$(git rev-parse --abbrev-ref HEAD) \ + current=$$(git rev-parse --abbrev-ref HEAD); \ git checkout "$(GIT_DST_BRANCH)" && \ git merge "$(GIT_SRC_BRANCH)" && \ git checkout "$$current" @@ -199,13 +198,15 @@ $(VERSION_FILE): .git/refs/heads/* echo "VERSION = \"$$(git describe)\"" > $@ # Pub is Nico's "push to all git remotes" thing -# git-release is the better term -git-release pub: +pub: for remote in "" github sf; do \ echo "Pushing to $$remote" \ git push --mirror $$remote \ done +git-release: git-tag git-branch-merge + make pub + ################################################################################ # pypi #