Autogenerated HTML docs for v1.4.0-rc1-gdd82

[git.git] / git-cherry.html

diff --git a/git-cherry.html b/git-cherry.html
index c368028..39a365b 100644 (file)
--- a/git-cherry.html
+++ b/git-cherry.html
@@ -276,11 +276,17 @@ git-cherry(1) Manual Page
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
-<p>Each commit between the fork-point and &lt;head&gt; is examined, and compared against\r
-the change each commit between the fork-point and &lt;upstream&gt; introduces.\r
-Commits already included in upstream are prefixed with <em>-</em> (meaning "drop from\r
-my local pull"), while commits missing from upstream are prefixed with <em>+</em>\r
-(meaning "add to the updated upstream").</p>\r
+<p>The changeset (or "diff") of each commit between the fork-point and &lt;head&gt;\r
+is compared against each commit between the fork-point and &lt;upstream&gt;.</p>\r
+<p>Every commit with a changeset that doesn't exist in the other branch\r
+has its id (sha1) reported, prefixed by a symbol.  Those existing only\r
+in the &lt;upstream&gt; branch are prefixed with a minus (-) sign, and those\r
+that only exist in the &lt;head&gt; branch are prefixed with a plus (+) symbol.</p>\r
+<p>Because git-cherry compares the changeset rather than the commit id\r
+(sha1), you can use git-cherry to find out if a commit you made locally\r
+has been applied &lt;upstream&gt; under a different commit id.  For example,\r
+this will happen if you're feeding patches &lt;upstream&gt; via email rather\r
+than pushing or pulling commits directly.</p>\r
 </div>\r
 <h2>OPTIONS</h2>\r
 <div class="sectionbody">\r
@@ -325,7 +331,7 @@ my local pull"), while commits missing from upstream are prefixed with <em>+</em
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 10-Mar-2006 00:31:22 UTC\r
+Last updated 05-May-2006 23:14:11 UTC\r
 </div>\r
 </div>\r
 </body>\r