[tokkee]

tokkee.org

Code

projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 56ae8df)
Documentation: git-cherry uses git-patch-id
authorJunio C Hamano <gitster@pobox.com>
Thu, 29 May 2008 00:03:46 +0000 (17:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 29 May 2008 00:03:46 +0000 (17:03 -0700)
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 patch | blob | history

diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt
index b0468aa746a074741de8b4a4ebeb82c177edb1e8..d8e0a5b843d8c8d02df2150a05f4d9c5928596f4 100644 (file)
--- 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>
Git - the stupid content tracker