mirror of
https://github.com/git/git
synced 2024-08-26 19:19:18 +00:00
![]() 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> |
||
---|---|---|
.. | ||
t | ||
.gitignore | ||
COPYING | ||
git-subtree.sh | ||
git-subtree.txt | ||
INSTALL | ||
Makefile | ||
README | ||
todo |
Please read git-subtree.txt for documentation. Please don't contact me using github mail; it's slow, ugly, and worst of all, redundant. Email me instead at apenwarr@gmail.com and I'll be happy to help. Avery