From c9d9e8e4b3cf0b34b8a96c6038d5aefd098f4a32 Mon Sep 17 00:00:00 2001 From: Danielle McLean Date: Fri, 15 Mar 2019 08:31:54 +1100 Subject: [PATCH] Make git-finish work with release branches too by having it merge any non-feature branch into master --- local/bin/git-finish | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/local/bin/git-finish b/local/bin/git-finish index d5ecdfc..98dc49b 100755 --- 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