On Mon, Mar 07, 2011 at 04:21:54PM -0800, Junio C Hamano wrote: > > +produced a 'combined diff' when showing a merge. This is the default > > s/produced/produce/, I think. Oops. > > +format when showing merge conflicts with linkgit:git-diff[1] or a merge > > +commit with linkgit:git-show[1]. Note also that you can view the full > > +diff with the `-m` option. > > This "Note" is a bit unclear what command it applies to, isn't it? I know > it applies to all the commands mentioned in the previous sentence in the > paragraph, but we are not writing the documentation for me, so perhaps > > Note also that you can give the `-m' option to any of these > commands to force generation of diffs with individual parents of a > merge. Yeah, reading it again, I agree it is unclear. Yours is better. > Also -c and --cc are technically _not_ about "showing merge conflicts". > It is about "showing a merge commit". I don't know if we want to teach > the distinction in this part of the document, though. Yeah, I almost said that, but I couldn't figure out a way to convince "git diff" to show me a merge commit, and clearly it is one of the interesting commands to mention as "defaults to --cc". Again, I think this section would be better as "This is what combined diff looks like" and leave the discussion of "this is how and when you trigger combined diff" to the individual command manpages. But that is a much bigger cleanup. > If you resolve a conflicted merge taking the results from only one side > for a given hunk, --cc won't show anything. If on the other hand, you > futz with a clean merge so that your result does not match with any > parent, --cc will show it. Right, that's the same as "diff-tree --cc" would show if you committed it, no? Which makes sense to me. -Peff -- 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