Re: cherry picking changesets instead of commits

From: Geoffrey Irving <irving@naml.us>
Date: May 28, 2008, 21:14 UTC
Message-ID: <7f9d599f0805281414x6b97070ag7a1cc36f5d3c5a36@mail.gmail.com>
In-Reply-To: <7v3ao2tawd.fsf@gitster.siamese.dyndns.org>

On Wed, May 28, 2008 at 1:46 PM, Junio C Hamano <gitster@pobox.com> wrote:

Show 24 quoted lines

> "Geoffrey Irving" <irving@naml.us> writes:
>
>> commit a1bac5e1aa52f9a78733aa35a0a7e820df618301
>> Author: Geoffrey Irving <irving@naml.us>
>> Date:   Wed May 28 12:38:11 2008 -0700
>>
>>     doc: mention git-patch-id in git-cherry documentation
>>
>> diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt
>> index b0468aa..9817fb5 100644
>> --- a/Documentation/git-cherry.txt
>> +++ b/Documentation/git-cherry.txt
>> @@ -41,6 +41,8 @@ has been applied <upstream> under a different commit
>> id.  For example,
>>  this will happen if you're feeding patches <upstream> via email rather
>>  than pushing or pulling commits directly.
>>
>> +For details about how patches are compared, see git-patch-id.
>> +
>
> Thanks.
>
> In manual pages, "SEE ALSO" section is a more appropriate place to do this
> kind of thing.

Here's an improved patch.

Geoffrey

commit 2417df3ffc04e05c187a93ae58f620f2709ae950
Author: Geoffrey Irving <irving@naml.us>
Date:   Wed May 28 12:38:11 2008 -0700

    doc: reference git-patch-id in git-cherry documentation

diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt
index b0468aa..dbf8895 100644
--- a/Documentation/git-cherry.txt
+++ b/Documentation/git-cherry.txt
@@ -56,6 +56,11 @@ OPTIONS
 <limit>::
        Do not report commits up to (and including) limit.

+See Also
+--------
+'git-patch-id(1)'::
+       The mechanism git-cherry uses to compare changesets.
+
 Author
 ------
 Written by Junio C Hamano <junkio@cox.net>