git-commit-vandalism

History

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>

2022-02-01 11:31:51 -08:00

tests: fix broken &&-chains in $(...) command substitutions

2021-12-13 10:29:48 -08:00

.gitignore

subtree: add an install-html target

2014-10-15 15:17:08 -07:00

COPYING

Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb5230361c64946232cc346'

2012-04-09 20:22:55 -05:00

git-subtree.sh

subtree: force merge commit

2022-02-01 11:31:51 -08:00

git-subtree.txt

subtree: push: allow specifying a local rev other than HEAD

2021-04-28 16:47:19 +09:00

INSTALL

Fix git-subtree install instructions

2012-04-09 22:26:19 -05:00

Makefile

subtree: fix build with AsciiDoctor 2

2020-04-08 12:10:36 -07:00

README

Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb5230361c64946232cc346'

2012-04-09 20:22:55 -05:00

todo

subtree: give the docs a once-over

2021-04-28 16:47:19 +09:00

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