git/subtree at 746aae3dd1a8e8dba31797ac237916d9533e4254 - git

Tree: 746aae3dd1

Thomas Koutcher 9158a3564a 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>		3 years ago
..
t	tests: fix broken &&-chains in `$(...)` command substitutions	3 years ago
.gitignore	subtree: add an install-html target	10 years ago
COPYING	…
INSTALL	Fix git-subtree install instructions	13 years ago
Makefile	subtree: fix build with AsciiDoctor 2	5 years ago
README	…
git-subtree.sh	subtree: force merge commit	3 years ago
git-subtree.txt	subtree: push: allow specifying a local rev other than HEAD	4 years ago
todo	subtree: give the docs a once-over	4 years ago

README


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