git-finish: fast-forward destination branches before merging into them

This commit is contained in:
Danielle McLean 2018-03-15 11:37:37 +11:00
parent ea343dbfa0
commit a91decbc47
Signed by: 00dani
GPG key ID: 5A5D2D1AFF12EEC5

View file

@ -14,6 +14,7 @@ git checkout $branch || exit $?
merge-into() {
echo "Merging $branch into $1..." >&2
git checkout $1 || exit $?
git merge --ff-only || exit $?
git merge --no-ff $branch --message "Merge $kind '$name'$pullreq into $1" || exit $?
}