diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-01-17 14:46:49 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-17 14:46:49 -0800 |
| commit | 61525f915b47e953b4288a9afcee45e47b352214 (patch) | |
| tree | f0649f89cc7a77c0296305f4673fc2bc7e0a6d54 /git-cherry.html | |
| parent | bc8d4783cac3c942fc9e8cf2f3eae4aea8cab5cb (diff) | |
| download | git-htmldocs-61525f915b47e953b4288a9afcee45e47b352214.tar.gz | |
Autogenerated HTML docs for v1.9-rc0
Diffstat (limited to 'git-cherry.html')
| -rw-r--r-- | git-cherry.html | 78 |
1 files changed, 41 insertions, 37 deletions
diff --git a/git-cherry.html b/git-cherry.html index 049d8ea8c..23d4d15a7 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="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.8" />
+<meta name="generator" content="AsciiDoc 8.6.6" />
<title>git-cherry(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -87,15 +87,11 @@ ul, ol, li > p { ul > li { color: #aaa; }
ul > li > * { color: black; }
-.monospaced, code, pre {
- font-family: "Courier New", Courier, monospace;
- font-size: inherit;
- color: navy;
+pre {
padding: 0;
margin: 0;
}
-
#author {
color: #527bbd;
font-weight: bold;
@@ -353,7 +349,7 @@ div.colist td img { margin-bottom: 0.1em;
}
-div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
margin-top: 0;
margin-bottom: 0;
}
@@ -411,14 +407,18 @@ span.underline { text-decoration: underline; } span.overline { text-decoration: overline; }
span.line-through { text-decoration: line-through; }
-div.unbreakable { page-break-inside: avoid; }
-
/*
* xhtml11 specific
*
* */
+tt {
+ font-family: monospace;
+ font-size: inherit;
+ color: navy;
+}
+
div.tableblock {
margin-top: 1.0em;
margin-bottom: 1.5em;
@@ -452,6 +452,12 @@ div.tableblock > table[frame="vsides"] { *
* */
+.monospaced {
+ font-family: monospace;
+ font-size: inherit;
+ color: navy;
+}
+
table.tableblock {
margin-top: 1.0em;
margin-bottom: 1.5em;
@@ -531,8 +537,6 @@ body.manpage div.sectionbody { @media print {
body.manpage div#toc { display: none; }
}
-
-
</style>
<script type="text/javascript">
/*<+'])');
+ var re = new RegExp('[hH]([2-'+(toclevels+1)+'])');
// Function that scans the DOM tree for header elements (the DOM2
// nodeIterator API would be a better technique but not supported by all
// browsers).
@@ -606,7 +610,7 @@ toc: function (toclevels) { var i;
for (i = 0; i < toc.childNodes.length; i++) {
var entry = toc.childNodes[i];
- if (entry.nodeName.toLowerCase() == 'div'
+ if (entry.nodeName == 'div'
&& entry.getAttribute("class")
&& entry.getAttribute("class").match(/^toclevel/))
tocEntriesToRemove.push(entry);
@@ -652,7 +656,7 @@ footnotes: function () { var entriesToRemove = [];
for (i = 0; i < noteholder.childNodes.length; i++) {
var entry = noteholder.childNodes[i];
- if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
+ if (entry.nodeName == 'div' && entry.getAttribute("class") == "footnote")
entriesToRemove.push(entry);
}
for (i = 0; i < entriesToRemove.length; i++) {
@@ -754,14 +758,14 @@ git-cherry(1) Manual Page <div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Determine whether there are commits in <code><head>..<upstream></code> that are
-equivalent to those in the range <code><limit>..<head></code>.</p></div>
+<div class="paragraph"><p>Determine whether there are commits in <tt><head>..<upstream></tt> that are
+equivalent to those in the range <tt><limit>..<head></tt>.</p></div>
<div class="paragraph"><p>The equivalence test is based on the diff, after removing whitespace
and line numbers. git-cherry therefore detects when commits have been
"copied" by means of <a href="git-cherry-pick.html">git-cherry-pick(1)</a>, <a href="git-am.html">git-am(1)</a> or
<a href="git-rebase.html">git-rebase(1)</a>.</p></div>
-<div class="paragraph"><p>Outputs the SHA1 of every commit in <code><limit>..<head></code>, prefixed with
-<code>-</code> for commits that have an equivalent in <upstream>, and <code>+</code> for
+<div class="paragraph"><p>Outputs the SHA1 of every commit in <tt><limit>..<head></tt>, prefixed with
+<tt>-</tt> for commits that have an equivalent in <upstream>, and <tt>+</tt> for
commits that do not.</p></div>
</div>
</div>
@@ -816,17 +820,17 @@ applied by the upstream maintainer. In such a workflow you might create and send a topic branch like this:</p></div>
<div class="listingblock">
<div class="content">
-<pre><code>$ git checkout -b topic origin/master
+<pre><tt>$ git checkout -b topic origin/master
# work and create some commits
$ git format-patch origin/master
-$ git send-email ... 00*</code></pre>
+$ git send-email ... 00*</tt></pre>
</div></div>
<div class="paragraph"><p>Later, you can see whether your changes have been applied by saying
-(still on <code>topic</code>):</p></div>
+(still on <tt>topic</tt>):</p></div>
<div class="listingblock">
<div class="content">
-<pre><code>$ git fetch # update your notion of origin/master
-$ git cherry -v</code></pre>
+<pre><tt>$ git fetch # update your notion of origin/master
+$ git cherry -v</tt></pre>
</div></div>
</div>
<div class="sect2">
@@ -835,7 +839,7 @@ $ git cherry -v</code></pre> maintainer applied two of them, the situation might look like:</p></div>
<div class="listingblock">
<div class="content">
-<pre><code>$ git log --graph --oneline --decorate --boundary origin/master...topic
+<pre><tt>$ git log --graph --oneline --decorate --boundary origin/master...topic
* 7654321 (origin/master) upstream tip commit
[... snip some other commits ...]
* cccc111 cherry-pick of C
@@ -845,21 +849,21 @@ maintainer applied two of them, the situation might look like:</p></div> | * bbbb000 commit B
| * aaaa000 commit A
|/
-o 1234567 branch point</code></pre>
+o 1234567 branch point</tt></pre>
</div></div>
<div class="paragraph"><p>In such cases, git-cherry shows a concise summary of what has yet to
be applied:</p></div>
<div class="listingblock">
<div class="content">
-<pre><code>$ git cherry origin/master topic
+<pre><tt>$ git cherry origin/master topic
- cccc000... commit C
+ bbbb000... commit B
-- aaaa000... commit A</code></pre>
+- aaaa000... commit A</tt></pre>
</div></div>
-<div class="paragraph"><p>Here, we see that the commits A and C (marked with <code>-</code>) can be
-dropped from your <code>topic</code> branch when you rebase it on top of
-<code>origin/master</code>, while the commit B (marked with <code>+</code>) still needs to
-be kept so that it will be sent to be applied to <code>origin/master</code>.</p></div>
+<div class="paragraph"><p>Here, we see that the commits A and C (marked with <tt>-</tt>) can be
+dropped from your <tt>topic</tt> branch when you rebase it on top of
+<tt>origin/master</tt>, while the commit B (marked with <tt>+</tt>) still needs to
+be kept so that it will be sent to be applied to <tt>origin/master</tt>.</p></div>
</div>
<div class="sect2">
<h3 id="_using_a_limit">Using a limit</h3>
@@ -868,7 +872,7 @@ other work that is not in upstream. Expanding on the previous example, this might look like:</p></div>
<div class="listingblock">
<div class="content">
-<pre><code>$ git log --graph --oneline --decorate --boundary origin/master...topic
+<pre><tt>$ git log --graph --oneline --decorate --boundary origin/master...topic
* 7654321 (origin/master) upstream tip commit
[... snip some other commits ...]
* cccc111 cherry-pick of C
@@ -881,16 +885,16 @@ example, this might look like:</p></div> [... snip ...]
| * 0000aaa unpublished stuff A
|/
-o 1234567 merge-base between upstream and topic</code></pre>
+o 1234567 merge-base between upstream and topic</tt></pre>
</div></div>
-<div class="paragraph"><p>By specifying <code>base</code> as the limit, you can avoid listing commits
-between <code>base</code> and <code>topic</code>:</p></div>
+<div class="paragraph"><p>By specifying <tt>base</tt> as the limit, you can avoid listing commits
+between <tt>base</tt> and <tt>topic</tt>:</p></div>
<div class="listingblock">
<div class="content">
-<pre><code>$ git cherry origin/master topic base
+<pre><tt>$ git cherry origin/master topic base
- cccc000... commit C
+ bbbb000... commit B
-- aaaa000... commit A</code></pre>
+- aaaa000... commit A</tt></pre>
</div></div>
</div>
</div>
|