Skip to content

G
gitflow
Commit 7d0a4096 authored by Daniel Truemper's avatar Daniel Truemper
Browse files
Options

Merge branch 'tag-releases' into develop

parents e17663f8 3ba8b3d6
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
gitflow-release
View file @ 7d0a4096
...@@ -41,6 +41,7 @@ finish() { ...@@ -41,6 +41,7 @@ finish() {
gitflow_check_clean_working_tree gitflow_check_clean_working_tree
echo "git checkout master" echo "git checkout master"
echo "git merge --no-ff release-$RELEASE" echo "git merge --no-ff release-$RELEASE"
echo "git tag $RELEASE"
echo "git checkout develop" echo "git checkout develop"
echo "git merge --no-ff release-$RELEASE" echo "git merge --no-ff release-$RELEASE"
echo "git branch -d release-$RELEASE" echo "git branch -d release-$RELEASE"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment