diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2022-02-17 16:25:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-17 16:25:04 -0800 |
| commit | 0ac270cf7c0d77b91670bda843578e943f5790bd (patch) | |
| tree | acf518b00bc830162b8f033f7b4921918818bd47 /compat/zlib-uncompress2.c | |
| parent | The fourth batch (diff) | |
| parent | subtree: force merge commit (diff) | |
| download | tgif-0ac270cf7c0d77b91670bda843578e943f5790bd.tar.xz | |
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
Diffstat (limited to 'compat/zlib-uncompress2.c')
0 files changed, 0 insertions, 0 deletions