On Thu, Apr 15, 2010 at 8:13 PM, Avery Pennarun <apenwarr@xxxxxxxxx> wrote: > true >profile # blank the file > git commit -a -m resolved > git show HEAD:profile > # no output Well, I wouldn't expect output from show HEAD:profile. But this is odd:: $ git diff HEAD^1 --name-status M profile $ git diff HEAD^2 --name-status M profile $ git diff-tree HEAD --name-status <no output> Hmfph. "git log -m -p -1" at least gives the diffs from each side. j. -- 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