On Thu, Nov 4, 2010 at 5:50 PM, Jonathan Nieder <jrnieder@xxxxxxxxx> wrote: > . ÂSo I guess technically the separate operation modes are > > Â Â Â Âgit diff [--cached] > Â Â Â Âgit diff [--cached] <tree> > Â Â Â Âgit diff <tree> <tree> > Â Â Â Âgit diff --no-index <path> <path> > Â Â Â Âgit diff <blob> <blob> > > where --cached means "use the version of the work tree stored > in the index in place of the real thing". I prefer this above the other proposals. This breakdown makes the most sense to me, and I see no reason to use <commit> when we really mean <tree>. One minor thing: should the "<blob> <blob>" form be moved above "<path> <path>" so that all the git object forms are together? On a related note, I find it a bit confusing that <path> is used to mean two very different things. For "<path> <path>", it means a file that must exist on disk. For "[<path>...]", it means a pattern on which to filter the output of the command. Since we already have a name for the latter, perhaps we should use the term "[<pathspec>...]". -- 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