Ramkumar Ramachandra <artagnon@xxxxxxxxx> writes: > Matthieu Moy wrote: >> 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/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html