git/subtree at dd21d43b58ee3ce1b9801b5121fead0298961be1 - git

Tree: dd21d43b58

Strain, Roger L dd21d43b58 subtree: make --ignore-joins pay attention to adds Changes the behavior of --ignore-joins to always consider a subtree add commit, and ignore only splits and squashes. The --ignore-joins option is documented to ignore prior --rejoin commits. However, it additionally ignored subtree add commits generated when a subtree was initially added to a repo. Due to the logic which determines whether a commit is a mainline commit or a subtree commit (namely, the presence or absence of content in the subtree prefix) this causes commits before the initial add to appear to be part of the subtree. An --ignore-joins split would therefore consider those commits part of the subtree history and include them at the beginning of the synthetic history, causing the resulting hashes to be incorrect for all later commits. Signed-off-by: Strain, Roger L <roger.strain@swri.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>		6 years ago
..
t	subtree test: simplify preparation of expected results	7 years ago
.gitignore	…
COPYING	…
INSTALL	…
Makefile	…
README	…
git-subtree.sh	subtree: make --ignore-joins pay attention to adds	6 years ago
git-subtree.txt	Correct mispellings of ".gitmodule" to ".gitmodules"	7 years ago
todo	…

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