git-commit-vandalism

History

David Aguilar 0f12c7d4d1 subtree: fix "git subtree split --rejoin" "git merge" in v2.9 prevents merging unrelated histories. "git subtree split --rejoin" creates unrelated histories when creating a split repo from a raw sub-directory that did not originate from an invocation of "git subtree add". Restore the original behavior by passing --allow-unrelated-histories when merging subtrees. This ensures that the synthetic history created by "git subtree split" can be merged. Add a test to ensure that this feature works as advertised. Reported-by: Brett Cundal <brett.cundal@iugome.com> Helped-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2016-07-26 13:57:00 -07:00
..
t	subtree: fix "git subtree split --rejoin"	2016-07-26 13:57:00 -07: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: fix "git subtree split --rejoin"	2016-07-26 13:57:00 -07:00
git-subtree.txt	contrib/subtree: there's no push --squash	2015-05-07 11:03:32 -07:00
INSTALL	Fix git-subtree install instructions	2012-04-09 22:26:19 -05:00
Makefile	contrib/subtree: Make testing easier	2016-01-19 10:15:20 -08:00
README	Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb5230361c64946232cc346'	2012-04-09 20:22:55 -05:00
todo	contrib/subtree: remove "push" command from the "todo" file	2015-11-06 09:32:33 -08: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