On Thu, Feb 24, 2011 at 02:33:53PM +1100, Stephen Rothwell wrote: > I am not sure when this started, but I think git has changed its behaviour > when merging. As you all know, I do a lot of merging of trees for > linux-next each day. Today I noticed that when I merge a tree, sometimes > the timestamps are modified for files that are not modified on one side > of the merge. It is not consistent and it is not all the files that are > modified on the HEAD side (relative to the merge-base). > > [...] > > I am pretty sure that git did not used to do this. Has anyone else seen > this? I am running git version 1.7.4.1 from Debian unstable. I don't think any such change was intentional. I couldn't reproduce with a trivial example. Can you give the commit IDs of the two heads in your example merge? I'd like to try bisecting if I can reproduce the issue. -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