From a91decbc47610c8c7486bca5cd1af107987bcf24 Mon Sep 17 00:00:00 2001 From: Danielle McLean Date: Thu, 15 Mar 2018 11:37:37 +1100 Subject: [PATCH] git-finish: fast-forward destination branches before merging into them --- local/bin/git-finish | 1 + 1 file changed, 1 insertion(+) 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 $? }