Make git-finish work with release branches too by having it merge any non-feature branch into master

This commit is contained in:
Danielle McLean 2019-03-15 08:31:54 +11:00
parent 7bdd6b5659
commit c9d9e8e4b3
Signed by: 00dani
GPG key ID: 8EB789DDF3ABD240

View file

@ -18,7 +18,7 @@ merge-into() {
git merge --no-ff $branch --message "Merge $kind '$name'$pullreq into $1" || exit $?
}
[[ $kind = hotfix ]] && merge-into master
[[ $kind = feature ]] || merge-into master
merge-into develop
echo "Merge successful, deleting $branch..." >&2