]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 45fe28c 9158a35)
Merge branch 'tk/subtree-merge-not-ff-only'
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Feb 2022 00:25:04 +0000 (16:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Feb 2022 00:25:04 +0000 (16:25 -0800)
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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.