Subject: Re: cherry-pick applies some other changes than the specified one?

From: Jonathan Nieder <[email-masked]>
Date: Tue, 22 Mar 2011 00:27:43 -0500

Junio C Hamano wrote:

> This just leaves the details of what -c/--cc are about to the combined
> diff format section in diff-generate-patch.txt, which I updated in the
> separate patch.

Thanks; this looks pretty good.  A few nitpicks:

> --- a/Documentation/diff-options.txt
> +++ b/Documentation/diff-options.txt
> @@ -24,6 +24,37 @@ ifndef::git-format-patch[]
>  --patch::
>  	Generate patch (see section on generating patches).
>  	{git-diff? This is the default.}
> +
> +-1 --base::
> +-2 --ours::
> +-3 --theirs::
> +-0::
> +	These make sense only when comparing the index and the working
> +	tree (i.e. `git diff-files` or `git diff <path>...`) and compares
> +	against the "base" version, "our branch" or "their
> +	branch" respectively.  With these options, diffs for
> +	merged entries are not shown.
> ++
> +The default is to diff against our branch (-2) and the
> +cleanly resolved paths.  The option -0 can be given to
> +omit diff output for unmerged entries and just show "Unmerged".

I am not sure what this comment about the default means.  Isn't the
default to use --cc?

> +
> +-c::
> +--cc::
> +	Produce "combined diff" (and "dense combined diff" showing how the
> +	result is different compared to more than one original.

Missing an article after "Produce" (produce a combined diff) and a
closing parenthesis after "dense combined diff", I think.

More importantly, it might be nice to say

	See the section "diff format for merges" of
	linkgit:git-diff[1] for details.