summaryrefslogtreecommitdiffstats
path: root/git-cherry.html
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.html
parent249572f7c8a246cc1bb6c31a30d599f85bb10cb9 (diff)
downloadgit-htmldocs-ff4b4317784217ee2620caf2cd06b3d4b6b00a9a.tar.gz
Autogenerated HTML docs for v1.4.3.3-geb15
Diffstat (limited to 'git-cherry.html')
-rw-r--r--git-cherry.html7
1 files changed, 4 insertions, 3 deletions
diff --git a/git-cherry.html b/git-cherry.html
index 559f8c505..cec73bfc7 100644
--- a/git-cherry.html
+++ b/git-cherry.html
@@ -278,8 +278,9 @@ git-cherry(1) Manual Page
<div class="sectionbody">
<p>The changeset (or "diff") of each commit between the fork-point and &lt;head&gt;
is compared against each commit between the fork-point and &lt;upstream&gt;.</p>
-<p>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
+<p>Every commit that doesn't exist in the &lt;upstream&gt; branch
+has its id (sha1) reported, prefixed by a symbol. The ones that have
+equivalent change already
in the &lt;upstream&gt; branch are prefixed with a minus (-) sign, and those
that only exist in the &lt;head&gt; branch are prefixed with a plus (+) symbol.</p>
<p>Because git-cherry compares the changeset rather than the commit id
@@ -331,7 +332,7 @@ than pushing or pulling commits directly.</p>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 03-Oct-2006 08:40:56 UTC
+Last updated 25-Oct-2006 22:55:22 UTC
</div>
</div>
</body>