do not change to the masterbranch...
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
This commit is contained in:
parent
f034ed6027
commit
8ed5f85f9d
1 changed files with 4 additions and 2 deletions
|
@ -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
|
||||||
git checkout master
|
if [ "$masterbranch" = yes ]; then
|
||||||
git merge "$target_branch"
|
git checkout master
|
||||||
|
git merge "$target_branch"
|
||||||
|
fi
|
||||||
|
|
||||||
# Publish git changes
|
# Publish git changes
|
||||||
make pub
|
make pub
|
||||||
|
|
Loading…
Reference in a new issue