Skip to content

Instantly share code, notes, and snippets.

@mbenford

mbenford/git-merge-release.sh

Created November 4, 2014 17:17
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save mbenford/43c8ac27895823bbc2ec to your computer and use it in GitHub Desktop.
Save mbenford/43c8ac27895823bbc2ec to your computer and use it in GitHub Desktop.
Download ZIP
Raw
git-merge-release.sh
#!/bin/bash
set -e
release_branch=$(git-get-release-branch.sh $1)
local_branch=$(git rev-parse --symbolic-full-name --abbrev-ref HEAD)
if [ "$local_branch" != "master" ]; then
echo "The current branch is not master. Aborting."
exit 1
fi
echo "Merging $release_branch into master..."
git merge --no-ff $release_branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment