X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-cherry.html;h=39a365b620032f4e9739d34fb861bbe0abcde698;hb=1bab4b0c25397665461ac79c23871ba23e83cf9f;hp=a78b8e0e2eefbc265460a75c458c461f3d1e8b34;hpb=1a4e841b439ba014b365999c3a6b9e2be3740bd8;p=git.git

diff --git a/git-cherry.html b/git-cherry.html
index a78b8e0e..39a365b6 100644
--- a/git-cherry.html
+++ b/git-cherry.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 7.0.1" />
+<meta name="generator" content="AsciiDoc 7.0.2" />
 <style type="text/css">
 /* Debug borders */
 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -266,7 +266,7 @@ git-cherry(1) Manual Page
 <h2>NAME</h2>
 <div class="sectionbody">
 <p>git-cherry -
-   Find commits not merged upstream.
+   Find commits not merged upstream
 </p>
 </div>
 </div>
@@ -276,11 +276,17 @@ git-cherry(1) Manual Page
 </div>
 <h2>DESCRIPTION</h2>
 <div class="sectionbody">
-<p>Each commit between the fork-point and &lt;head&gt; is examined, and compared against
-the change each commit between the fork-point and &lt;upstream&gt; introduces.
-Commits already included in upstream are prefixed with <em>-</em> (meaning "drop from
-my local pull"), while commits missing from upstream are prefixed with <em>+</em>
-(meaning "add to the updated upstream").</p>
+<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
+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
+(sha1), you can use git-cherry to find out if a commit you made locally
+has been applied &lt;upstream&gt; under a different commit id.  For example,
+this will happen if you're feeding patches &lt;upstream&gt; via email rather
+than pushing or pulling commits directly.</p>
 </div>
 <h2>OPTIONS</h2>
 <div class="sectionbody">
@@ -325,7 +331,7 @@ my local pull"), while commits missing from upstream are prefixed with <em>+</em
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 27-Dec-2005 00:15:53 PDT
+Last updated 05-May-2006 23:14:11 UTC
 </div>
 </div>
 </body>
