| commit | 0ac270cf7c0d77b91670bda843578e943f5790bd | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 18 Feb 2022 00:25:04 +0000 (17 16:25 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 18 Feb 2022 00:25:04 +0000 (17 16:25 -0800) | ||
| tree | acf518b00bc830162b8f033f7b4921918818bd47 | treesnapshot (tar.gz zip) |
| parent | 45fe28c951c3e70666ee4ef8379772851a8e4d32 | commitdiff |
| parent | 9158a3564a970def3375a79e8f3f90927cd8e793 | commitdiff |
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
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