Re: cherry picking changesets instead of commits
On Wed, May 28, 2008 at 11:46 AM, Junio C Hamano <gitster@pobox.com> wrote:
Show 17 quoted lines
> Geoffrey Irving <geoffrey.irving@gmail.com> writes:
>
>> On May 28, 2008, at 11:19 AM, Junio C Hamano <gitster@pobox.com> wrote:
>>
>>> "Geoffrey Irving" <irving@naml.us> writes:
>>>
>>>> Would it be straightforward
>>>> to add an option to "git cherry" to ignore differences in metadata?
>>>> The cherry documentation doesn't give its criteria for when commits
>>>> match, and I'm not familiar enough with the code yet to figure out
>>>> those criteria directly from cmd_cherry in builtin-log.c.
>>>
>>> cherry does not look at metadata at all. It compares patch-ids.
>>
>> Can you define what a patch-id is?
>
> $ man git-patch-id
Thanks! Here's a patch to avoid duplicating this particular ignorant question.
Geoffrey
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.
+
OPTIONS
-------
Geoffrey Irving <irving@naml.us>