forked from ungleich-public/cdist
do not change to the masterbranch...
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
This commit is contained in:
parent
a3c5d32a54
commit
5a0a3971b0
1 changed files with 4 additions and 2 deletions
|
@ -247,8 +247,10 @@ eof
|
|||
"$0" release-git-tag
|
||||
|
||||
# Also merge back the version branch
|
||||
git checkout master
|
||||
git merge "$target_branch"
|
||||
if [ "$masterbranch" = yes ]; then
|
||||
git checkout master
|
||||
git merge "$target_branch"
|
||||
fi
|
||||
|
||||
# Publish git changes
|
||||
make pub
|
||||
|
|
Loading…
Reference in a new issue