> From: Junio C Hamano <gits...@pobox.com> > I suspect that it may be a good idea to split the section altogether > to reduce confusion like what triggered this thread, e.g. > > 'git diff' [--options] [--] [<path>...]:: > > This form is to view the changes you made relative to > the index (staging area for the next commit). In other > words, the differences are what you _could_ tell Git to > further add to the index but you still haven't. You can > stage these changes by using linkgit:git-add. > > 'git diff' --no-index [--options] [--] <path> <path>:: > > This form is to compare the given two paths on the > filesystem. When run in a working tree controlled by > Git, if at least one of the paths points outside the > working tree, or when run outside a working tree > controlled by Git, you can omit the `--no-index` option. > > For now, I'll queue your version as-is modulo style fixes, while > waiting for others to help polishing the documentation better.
It'd difficult to figure out how to describe it well. In my opinion, the problem here is the DWIM nature of the command, which means that there is a lot of interaction between the options that are specified, the number of path arguments, and the circumstances. My preference is for "do what I say", that the options restrict the command to operate in exactly one way, which determines the way the paths are used (and thus their number) and the context in which it can be used. But that's not how git-diff works. Dale -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html