diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2006-10-27 09:29:13 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2006-10-27 09:29:13 +0000 |
commit | a053d54fabc1d177125a3c62a267ca75f2cda80b (patch) | |
tree | 4e9c16a9a825e469def0007330c6e270d5077a06 /git-cherry.html | |
parent | 29f1431cd9ec079ebf2d1055c947a1883ddf0fa1 (diff) | |
download | git-htmldocs-a053d54fabc1d177125a3c62a267ca75f2cda80b.tar.gz |
Autogenerated HTML docs for v1.4.3.3-g01929
Diffstat (limited to 'git-cherry.html')
-rw-r--r-- | git-cherry.html | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/git-cherry.html b/git-cherry.html index cec73bfc7..0bdeaf7a6 100644 --- a/git-cherry.html +++ b/git-cherry.html @@ -272,7 +272,7 @@ git-cherry(1) Manual Page </div>
<h2>SYNOPSIS</h2>
<div class="sectionbody">
-<p><em>git-cherry</em> [-v] <upstream> [<head>]</p>
+<p><em>git-cherry</em> [-v] <upstream> [<head>] [<limit>]</p>
</div>
<h2>DESCRIPTION</h2>
<div class="sectionbody">
@@ -282,7 +282,23 @@ is compared against each commit between the fork-point and <upstream>.</p> has its id (sha1) reported, prefixed by a symbol. The ones that have
equivalent change already
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>
+that only exist in the <head> branch are prefixed with a plus (+) symbol:</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt> __*__*__*__*__> <upstream>
+ /
+fork-point
+ \__+__+__-__+__+__-__+__> <head></tt></pre>
+</div></div>
+<p>If a <limit> has been given then the commits along the <head> branch up
+to and including <limit> are not reported:</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt> __*__*__*__*__> <upstream>
+ /
+fork-point
+ \__*__*__<limit>__-__+__> <head></tt></pre>
+</div></div>
<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,
@@ -332,7 +348,7 @@ than pushing or pulling commits directly.</p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 25-Oct-2006 22:55:22 UTC
+Last updated 27-Oct-2006 09:28:58 UTC
</div>
</div>
</body>
|