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

do not change to the masterbranch...

Browse source 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
This commit is contained in:
Nico Schottelius 2014-01-20 14:48:05 +01:00
commit 8ed5f85f9d
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/build-helper
View file

@ -247,8 +247,10 @@ eof
"$0" release-git-tag "$0" release-git-tag
# Also merge back the version branch # Also merge back the version branch
if [ "$masterbranch" = yes ]; then
git checkout master git checkout master
git merge "$target_branch" git merge "$target_branch"
fi
# Publish git changes # Publish git changes
make pub make pub