Hi, On Sun, 20 Jan 2008, Linus Torvalds wrote: > On Sun, 20 Jan 2008, Johannes Schindelin wrote: > > > > Note: "git diff HEAD" as it is now still holds value; > > Oh, absolutely. > > It's not "git diff HEAD" that is broken. > > It's "git diff --cached HEAD" that doesn't work. The "--cached" means > that it's supposed to diff the index against HEAD, but since it cannot > handle unmerged entries, instead of getting a diff, you get just a line > saying > > * Unmerged path xyzzy > > and no diff at all. Silly me. Unmerged paths can only have problems when you look at the index, of course. Sorry for the noise, Dscho - 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
