Git Flow

git-flow-release-finish.sh

version=$1
if [ -z "$version" ]
  then
      echo "The version of the release: "
      read -r version
fi
if [ -z "$version" ]
  then
    echo Version not defined
  else
    branchname="release/$version"
    git checkout master
    git merge --no-ff --no-edit $branchname
    git tag -a v$version -m "Virtual Choir v$version"
    git checkout develop
    git merge --no-ff --no-edit $branchname
    git branch -d $branchname
    git push origin develop:develop
    git push origin master:master
    git push --tags

    echo "Summary of actions:"
    echo "- Release branch '$branchname' has been merged into 'master'"
    echo "- The release was tagged 'v$version'"
    echo "- Release tag 'v$version' has been back-merged into 'develop'"
    echo "- Release branch '$branchname' has been locally deleted"
    echo "- You are now on branch 'develop'"
fi

git-flow-release-start.sh

version=$1
if [ -z "$version" ]
  then
      echo "The version of the release: "
      read -r version
fi
if [ -z "$version" ]
  then
    echo Version not defined
  else
    branchname="release/$version"
    git checkout -b $branchname develop
    echo "Summary of actions:"
    echo "- A new branch '$branchname' was created, based on 'develop'"
    echo "- You are now on branch '$branchname'"
    echo ""
    echo "Follow-up actions:"
    echo "- Bump the version number now!"
    echo "- Start committing last-minute fixes in preparing your release"
    echo "- When done, run:"
    echo ""
    echo "     git-flow-release-finish $version"
fi