Re: [PATCH] git-cherry-pick: improve description of -x.

[Frank Lichtenheld <frank@lichtenheld.de>]

On Fri, Oct 19, 2007 at 07:41:34PM +0200, Ralf Wildenhues wrote:
> Further, I am surprised that -x seems to be nonfunctional when the
> cherry pick introduces a conflict.  Example:
[...]
> The prototype commit message now does not contain the
> | (cherry picked from commit ...).
> 
> Is that by design (because there were conflicts) or an omission?
> In case of the former, maybe the description of -x should mention this.

git commit currently doesn't know that you commit a cherry-pick. The -c
only says to use the commit message of the original commit. So this is
currently by design.

> diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
> index 47b1e8c..c7d83ce 100644
> --- a/Documentation/git-cherry-pick.txt
> +++ b/Documentation/git-cherry-pick.txt
> @@ -27,10 +27,10 @@ OPTIONS
>  	message prior committing.
>  
>  -x::
> -	Cause the command to append which commit was
> -	cherry-picked after the original commit message when
> -	making a commit.  Do not use this option if you are
> -	cherry-picking from your private branch because the
> +	When recording the commit, the original commit message will
> +	be appended with a note that indicates which commit this
> +	change was cherry-picked from.  Do not use this option if
> +	you are cherry-picking from your private branch because the

Is "will be appended with" correct English? Sounds odd to me (but I'm no
native speaker, so it might be perfectly fine).

Gruesse,
-- 
Frank Lichtenheld <frank@lichtenheld.de>
www: http://www.djpig.de/