summaryrefslogtreecommitdiffstats
path: root/git-cherry.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-05-29 02:09:50 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-05-29 02:09:50 +0000
commit9049d9108c3a4c2198a349fb905ec4a70cd62306 (patch)
treead3dfc48a168fdb1be155146f42bf20ef3776b9d /git-cherry.txt
parent99b28f2d2dcff6c124ebb41444e2ca4c8d5e241f (diff)
downloadgit-htmldocs-9049d9108c3a4c2198a349fb905ec4a70cd62306.tar.gz
Autogenerated HTML docs for v1.5.6-rc0-46-gd2b3
Diffstat (limited to 'git-cherry.txt')
-rw-r--r--git-cherry.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/git-cherry.txt b/git-cherry.txt
index b0468aa74..d8e0a5b84 100644
--- a/git-cherry.txt
+++ b/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>