From: Thomas Koutcher <thomas.koutcher@online.fr>

When `merge.ff` is set to `only` in .gitconfig, `git subtree pull` will
fail with error `fatal: Not possible to fast-forward, aborting.`, but
the command does want to make merges in these places. Add `--no-ff`
argument to `git merge` to enforce this behaviour.

Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Reviewed-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Thomas Koutcher <thomas.koutcher@online.fr>

Submitted-As: https://lore.kernel.org/git/pull.1139.v2.git.git.1636926322423.gitgitgadget@gmail.com
In-Reply-To: https://lore.kernel.org/git/pull.1139.git.git.1636902454370.gitgitgadget@gmail.com