Ramkumar Ramachandra [off-list ref] writes:
Matthieu Moy wrote:
quoted
This is somehow expected: the subtree merge changed the filename during
merge (it is subtree/file.txt after the merge, and just file.txt
before), so "git log" without --follow just considers the file appeared.
No, a merge does not "change" any filenames.
Read again my message, especially the "it is subtree/file.txt after the
merge, and just file.txt before" part. Replace "subtree" with "bar" and
"file.txt" with "ichi".
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/