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

2019-03-15 08:31:54 +11:00 · 2019-03-15 08:31:54 +11:00 · c9d9e8e4b3
commit c9d9e8e4b3
parent 7bdd6b5659
1 changed files with 1 additions and 1 deletions
--- a/local/bin/git-finish
+++ b/local/bin/git-finish
@ -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