]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4c53a8c) | patch
subtree: force merge commit
authorThomas Koutcher <thomas.koutcher@online.fr>
Tue, 1 Feb 2022 17:26:04 +0000 (18:26 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 1 Feb 2022 19:31:51 +0000 (11:31 -0800)
commit9158a3564a970def3375a79e8f3f90927cd8e793
tree8405cbc4d06a4970c3dd4737368603c783989d42tree | snapshot
parent4c53a8c20f8984adb226293a3ffd7b88c3f4ac1acommit | diff
subtree: force merge commit

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.

Signed-off-by: Thomas Koutcher <thomas.koutcher@online.fr>
Reviewed-by: Johannes Altmanninger <aclopte@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/subtree/git-subtree.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.