From a66bc8c343a9f1c45cfe9f9719e539c3b5d27658 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Tue, 9 Jul 2013 17:48:58 +0200
Subject: [PATCH] always merge tag based, not branch based, for releases

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 26273258..5d5e8157 100644
--- a/Makefile
+++ b/Makefile
@@ -187,10 +187,10 @@ $(GIT_TAG_FILE):
 	@printf "Enter tag description for $(CHANGELOG_VERSION)> "
 	@read tagmessage; git tag "$(CHANGELOG_VERSION)" -m "$$tagmessage"
 
-git-branch-merge:
+git-branch-merge: git-tag
 	current=$$(git rev-parse --abbrev-ref HEAD); \
 	git checkout "$(GIT_DST_BRANCH)" && \
-	git merge "$(GIT_SRC_BRANCH)" && \
+	git merge "$(CHANGELOG_VERSION)" && \
 	git checkout "$$current"