David Soria Parra <sn_@xxxxxxx> writes: > Well yes the history is preserved, but it's not connected to the > subdirectory. So you cannot do git-log B/foo.c as git doesnot know where > to search it as it thinks > it is in /foo.c not in B/foo.c The thing is, what you are talking is not about the subtree merge strategy, but the fundamental philosophy of git. Asking for "the history of file B/foo.c" does not make any sense, as git never tracks history of individual files. I'll point you to one of the most important messages in the whole archive of the git mailing list. http://thread.gmane.org/gmane.comp.version-control.git/27/focus=217 - 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