aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-cherry.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-05-28 17:03:46 -0700
committerJunio C Hamano <gitster@pobox.com>2008-05-28 17:03:46 -0700
commita7052d3521de1210026bf5a29d57c37ee7800166 (patch)
tree6415dda5a7b68f59a78bd642a8eff9c7cc3de91c /Documentation/git-cherry.txt
parent56ae8df5c7b05ee8982c9447fa31116104dc568f (diff)
downloadgit-a7052d3521de1210026bf5a29d57c37ee7800166.tar.gz
git-a7052d3521de1210026bf5a29d57c37ee7800166.tar.xz
Documentation: git-cherry uses git-patch-id
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>
Diffstat (limited to 'Documentation/git-cherry.txt')
-rw-r--r--Documentation/git-cherry.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt
index b0468aa74..d8e0a5b84 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>