<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.1" />\r
+<meta name="generator" content="AsciiDoc 7.0.2" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
<h2>NAME</h2>\r
<div class="sectionbody">\r
<p>git-cherry -\r
- Find commits not merged upstream.\r
+ Find commits not merged upstream\r
</p>\r
</div>\r
</div>\r
</div>\r
<h2>DESCRIPTION</h2>\r
<div class="sectionbody">\r
-<p>Each commit between the fork-point and <head> is examined, and compared against\r
-the change each commit between the fork-point and <upstream> 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 <head>\r
+is compared against each commit between the fork-point and <upstream>.</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 <upstream> branch are prefixed with a minus (-) sign, and those\r
+that only exist in the <head> 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 <upstream> under a different commit id. For example,\r
+this will happen if you're feeding patches <upstream> via email rather\r
+than pushing or pulling commits directly.</p>\r
</div>\r
<h2>OPTIONS</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:15:53 PDT\r
+Last updated 05-May-2006 23:14:11 UTC\r
</div>\r
</div>\r
</body>\r
projects / git.git / blobdiff