diff --git a/local/bin/git-finish b/local/bin/git-finish
index cf0f913..d5ecdfc 100755
--- a/local/bin/git-finish
+++ b/local/bin/git-finish
@@ -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 $?
 }