From: Junio C Hamano <gitster@pobox.com>
To: "Geoffrey Irving" <irving@naml.us>
Cc: "Junio C Hamano" <gitster@pobox.com>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: [PATCH] Documentation: git-cherry uses git-patch-id
Date: Wed, 28 May 2008 17:04:53 -0700 [thread overview]
Message-ID: <7v7idern4q.fsf_-_@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <7f9d599f0805281414x6b97070ag7a1cc36f5d3c5a36@mail.gmail.com> (Geoffrey Irving's message of "Wed, 28 May 2008 14:14:59 -0700")
"Geoffrey Irving" <irving@naml.us> writes:
> On Wed, May 28, 2008 at 1:46 PM, Junio C Hamano <gitster@pobox.com> wrote:
>
>> Thanks.
>>
>> In manual pages, "SEE ALSO" section is a more appropriate place to do this
>> kind of thing.
>
> Here's an improved patch.
Thanks, I'll do this instead...
-- >8 --
Geoffrey Irving noticed that git-cherry talks about comparing commits without
hinting how they are compared.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Documentation/git-cherry.txt | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt
index b0468aa..d8e0a5b 100644
--- a/Documentation/git-cherry.txt
+++ b/Documentation/git-cherry.txt
@@ -13,6 +13,8 @@ DESCRIPTION
-----------
The changeset (or "diff") of each commit between the fork-point and <head>
is compared against each commit between the fork-point and <upstream>.
+The commits are compared with their 'patch id', obtained from linkgit:git-patch-id[1]
+program.
Every commit that doesn't exist in the <upstream> branch
has its id (sha1) reported, prefixed by a symbol. The ones that have
@@ -56,6 +58,10 @@ OPTIONS
<limit>::
Do not report commits up to (and including) limit.
+SEE ALSO
+--------
+linkgit:git-patch-id[1]
+
Author
------
Written by Junio C Hamano <junkio@cox.net>
--
1.5.6.rc0.43.g823ea
next prev parent reply other threads:[~2008-05-29 0:05 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-28 18:06 cherry picking changesets instead of commits Geoffrey Irving
2008-05-28 18:19 ` Junio C Hamano
2008-05-28 18:28 ` Geoffrey Irving
2008-05-28 18:46 ` Junio C Hamano
2008-05-28 19:42 ` Geoffrey Irving
2008-05-28 20:46 ` Junio C Hamano
2008-05-28 21:14 ` Geoffrey Irving
2008-05-28 22:38 ` Jeff King
2008-05-28 22:48 ` Jeff King
2008-05-28 23:56 ` Junio C Hamano
2008-05-29 0:12 ` Jeff King
2008-05-29 0:04 ` Junio C Hamano [this message]
2008-05-29 0:07 ` [PATCH] Documentation: git-cherry uses git-patch-id Geoffrey Irving
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v7idern4q.fsf_-_@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=irving@naml.us \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).