From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 18 Feb 2022 00:25:04 +0000 (-0800)
Subject: Merge branch 'tk/subtree-merge-not-ff-only'
X-Git-Tag: v2.36.0-rc0~145
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ac270cf7c0d77b91670bda843578e943f5790bd;p=thirdparty%2Fgit.git

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

When "git subtree" wants to create a merge, it used "git merge" and
let it be affected by end-user's "merge.ff" configuration, which
has been corrected.

* tk/subtree-merge-not-ff-only:
  subtree: force merge commit
---

0ac270cf7c0d77b91670bda843578e943f5790bd