On Mon, Jul 02, 2012 at 02:47:54PM +0200, Torben Hohn wrote: > i just came over some issue, where the rename tracking got confused. > > I wanted to revert a commit to a moved file. But because it touched an > empty file, this seems to have confused the rename tracking. > (there were a few empty files there) Yeah, it happens. When there are multiple identical sources (which happens often with empty files), we try to disambiguate using some heuristics on the filename, but they are not always correct. As of v1.7.11, git will explicitly avoid auto-merging across renames of empty files. Instead, you'll get a modify/delete conflict and be given the opportunity to sort it out yourself. -Peff -- 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