summaryrefslogtreecommitdiffstats
path: root/git-cherry.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2006-10-25 22:55:31 +0000
committerJunio C Hamano <junio@hera.kernel.org>2006-10-25 22:55:31 +0000
commitff4b4317784217ee2620caf2cd06b3d4b6b00a9a (patch)
treefe258b15e72bbf6e1a04624ab94052e6f39c00c0 /git-cherry.txt
parent249572f7c8a246cc1bb6c31a30d599f85bb10cb9 (diff)
downloadgit-htmldocs-ff4b4317784217ee2620caf2cd06b3d4b6b00a9a.tar.gz
Autogenerated HTML docs for v1.4.3.3-geb15
Diffstat (limited to 'git-cherry.txt')
-rw-r--r--git-cherry.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/git-cherry.txt b/git-cherry.txt
index 893baaa6f..e1bf8ee25 100644
--- a/git-cherry.txt
+++ b/git-cherry.txt
@@ -14,8 +14,9 @@ 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>.
-Every commit with a changeset that doesn't exist in the other branch
-has its id (sha1) reported, prefixed by a symbol. Those existing only
+Every commit that doesn't exist in the <upstream> branch
+has its id (sha1) reported, prefixed by a symbol. The ones that have
+equivalent change already
in the <upstream> branch are prefixed with a minus (-) sign, and those
that only exist in the <head> branch are prefixed with a plus (+) symbol.