From: Geoffrey Irving Date: Wed, 28 May 2008 19:42:12 GMT Subject: Re: cherry picking changesets instead of commits Message-ID: <7f9d599f0805281242w5769a100s1153c2101992ff55@mail.gmail.com> In-Reply-To: <7vod6qtgfs.fsf@gitster.siamese.dyndns.org> On Wed, May 28, 2008 at 11:46 AM, Junio C Hamano wrote: > Geoffrey Irving writes: > >> On May 28, 2008, at 11:19 AM, Junio C Hamano wrote: >> >>> "Geoffrey Irving" 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 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 under a different commit id. For example, this will happen if you're feeding patches via email rather than pushing or pulling commits directly. +For details about how patches are compared, see git-patch-id. + OPTIONS -------