Merge branch 'tk/subtree-merge-not-ff-only' into jch

* tk/subtree-merge-not-ff-only: subtree: force merge commit
git · Feb 1, 2022 · 95d2499 · 95d2499
2 parents ac08ee3 + 9158a35
commit 95d2499
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
@@ -975,10 +975,10 @@ cmd_merge () {
 
 	if test -n "$arg_addmerge_message"
 	then
-		git merge -Xsubtree="$arg_prefix" \
+		git merge --no-ff -Xsubtree="$arg_prefix" \
 			--message="$arg_addmerge_message" "$rev"
 	else
-		git merge -Xsubtree="$arg_prefix" $rev
+		git merge --no-ff -Xsubtree="$arg_prefix" $rev
 	fi
 }