dot/git
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
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
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
local/bin/git-finish
View file

@ -18,7 +18,7 @@ merge-into() {
git merge --no-ff $branch --message "Merge $kind '$name'$pullreq into $1" || exit $? 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 merge-into develop
echo "Merge successful, deleting $branch..." >&2 echo "Merge successful, deleting $branch..." >&2