sparrowhawk/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

always merge tag based, not branch based, for releases

Browse source 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
This commit is contained in:
Nico Schottelius 2013-07-09 17:48:58 +02:00
parent bf9ad8b25c
commit a66bc8c343
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -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"