On Wed, Mar 13, 2013 at 09:45:47AM -0700, Junio C Hamano wrote: > Does the temporary checkout correctly apply the smudge filter and > crlf conversion, by the way? If not, regardless of the topic in > this thread, that may want to be fixed as well. I didn't check. I've had a look at this and I think it will be much quicker for someone more familiar with git-checkout-index to answer. What git-difftool does is to create a temporary index containing only the files that have changed (using git-update-index --index-info) and then check this out with "git checkout-index --prefix=...". So I think this question boils down to: does git-checkout-index still read .gitattributes from the working tree if given --prefix? John -- 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