diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2006-05-05 23:14:25 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2006-05-05 23:14:25 +0000 |
commit | 1bb569ec8189e0498dc17c57e9237ffd85beb273 (patch) | |
tree | 810ac97c3b91652af2e900f2779e111965c4984d /git-cherry.html | |
parent | 88a3a070894a23a10133fee89065cb27199cf58b (diff) | |
download | git-htmldocs-1bb569ec8189e0498dc17c57e9237ffd85beb273.tar.gz |
Autogenerated HTML docs for v1.3.2-g8611
Diffstat (limited to 'git-cherry.html')
-rw-r--r-- | git-cherry.html | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/git-cherry.html b/git-cherry.html index c3680286d..39a365b62 100644 --- a/git-cherry.html +++ b/git-cherry.html @@ -276,11 +276,17 @@ git-cherry(1) Manual Page </div>
<h2>DESCRIPTION</h2>
<div class="sectionbody">
-<p>Each commit between the fork-point and <head> is examined, and compared against
-the change each commit between the fork-point and <upstream> 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 <head>
+is compared against each commit between the fork-point and <upstream>.</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 <upstream> branch are prefixed with a minus (-) sign, and those
+that only exist in the <head> 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 <upstream> under a different commit id. For example,
+this will happen if you're feeding patches <upstream> 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 10-Mar-2006 00:31:22 UTC
+Last updated 05-May-2006 23:14:11 UTC
</div>
</div>
</body>
|