summaryrefslogtreecommitdiffstats
path: root/git-request-pull.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-10-31 13:25:53 -0700
committerJunio C Hamano <gitster@pobox.com>2014-10-31 13:25:53 -0700
commitc14e6ad9a230ad90c84b7f620d87fbe49a2d0342 (patch)
tree120346dc383e3d1c4219fe8c533eb22cb6af2b55 /git-request-pull.html
parent2a4bcbc355496c8d83b1b9f8892c4cbe8f584158 (diff)
downloadgit-htmldocs-c14e6ad9a230ad90c84b7f620d87fbe49a2d0342.tar.gz
Autogenerated HTML docs for v2.2.0-rc0
Diffstat (limited to 'git-request-pull.html')
-rw-r--r--git-request-pull.html60
1 files changed, 29 insertions, 31 deletions
diff --git a/git-request-pull.html b/git-request-pull.html
index 536cf868a..d20eb99ae 100644
--- a/git-request-pull.html
+++ b/git-request-pull.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.6" />
+<meta name="generator" content="AsciiDoc 8.6.9" />
<title>git-request-pull(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -87,10 +87,16 @@ ul, ol, li > p {
ul > li { color: #aaa; }
ul > li > * { color: black; }
-pre {
+.monospaced, code, pre {
+ font-family: "Courier New", Courier, monospace;
+ font-size: inherit;
+ color: navy;
padding: 0;
margin: 0;
}
+pre {
+ white-space: pre-wrap;
+}
#author {
color: #527bbd;
@@ -219,7 +225,7 @@ div.exampleblock > div.content {
}
div.imageblock div.content { padding-left: 0; }
-span.image img { border-style: none; }
+span.image img { border-style: none; vertical-align: text-bottom; }
a.image:visited { color: white; }
dl {
@@ -349,7 +355,7 @@ div.colist td img {
margin-bottom: 0.1em;
}
-div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
+div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
margin-top: 0;
margin-bottom: 0;
}
@@ -407,18 +413,14 @@ 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,12 +454,6 @@ div.tableblock > table[frame="vsides"] {
*
* */
-.monospaced {
- font-family: monospace;
- font-size: inherit;
- color: navy;
-}
-
table.tableblock {
margin-top: 1.0em;
margin-bottom: 1.5em;
@@ -537,6 +533,8 @@ body.manpage div.sectionbody {
@media print {
body.manpage div#toc { display: none; }
}
+
+
</style>
<script type="text/javascript">
/*<![CDATA[*/
@@ -581,7 +579,7 @@ toc: function (toclevels) {
function tocEntries(el, toclevels) {
var result = new Array;
- var re = new RegExp('[hH]([2-'+(toclevels+1)+'])');
+ var re = new RegExp('[hH]([1-'+(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).
@@ -610,7 +608,7 @@ toc: function (toclevels) {
var i;
for (i = 0; i < toc.childNodes.length; i++) {
var entry = toc.childNodes[i];
- if (entry.nodeName == 'div'
+ if (entry.nodeName.toLowerCase() == 'div'
&& entry.getAttribute("class")
&& entry.getAttribute("class").match(/^toclevel/))
tocEntriesToRemove.push(entry);
@@ -656,7 +654,7 @@ footnotes: function () {
var entriesToRemove = [];
for (i = 0; i < noteholder.childNodes.length; i++) {
var entry = noteholder.childNodes[i];
- if (entry.nodeName == 'div' && entry.getAttribute("class") == "footnote")
+ if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
entriesToRemove.push(entry);
}
for (i = 0; i < entriesToRemove.length; i++) {
@@ -762,9 +760,9 @@ git-request-pull(1) Manual Page
their tree. The request, printed to the standard output, summarizes
the changes and indicates from where they can be pulled.</p></div>
<div class="paragraph"><p>The upstream project is expected to have the commit named by
-<tt>&lt;start&gt;</tt> and the output asks it to integrate the changes you made
-since that commit, up to the commit named by <tt>&lt;end&gt;</tt>, by visiting
-the repository named by <tt>&lt;url&gt;</tt>.</p></div>
+<code>&lt;start&gt;</code> and the output asks it to integrate the changes you made
+since that commit, up to the commit named by <code>&lt;end&gt;</code>, by visiting
+the repository named by <code>&lt;url&gt;</code>.</p></div>
</div>
</div>
<div class="sect1">
@@ -804,9 +802,9 @@ the repository named by <tt>&lt;url&gt;</tt>.</p></div>
Commit to end at (defaults to HEAD). This names the commit
at the tip of the history you are asking to be pulled.
</p>
-<div class="paragraph"><p>When the repository named by <tt>&lt;url&gt;</tt> has the commit at a tip of a
+<div class="paragraph"><p>When the repository named by <code>&lt;url&gt;</code> has the commit at a tip of a
ref that is different from the ref you have locally, you can use the
-<tt>&lt;local&gt;:&lt;remote&gt;</tt> syntax, to have its local name, a colon <tt>:</tt>, and
+<code>&lt;local&gt;:&lt;remote&gt;</code> syntax, to have its local name, a colon <code>:</code>, and
its remote name.</p></div>
</dd>
</dl></div>
@@ -815,32 +813,32 @@ its remote name.</p></div>
<div class="sect1">
<h2 id="_example">EXAMPLE</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Imagine that you built your work on your <tt>master</tt> branch on top of
-the <tt>v1.0</tt> release, and want it to be integrated to the project.
+<div class="paragraph"><p>Imagine that you built your work on your <code>master</code> branch on top of
+the <code>v1.0</code> release, and want it to be integrated to the project.
First you push that change to your public repository for others to
see:</p></div>
<div class="literalblock">
<div class="content">
-<pre><tt>git push https://git.ko.xz/project master</tt></pre>
+<pre><code>git push https://git.ko.xz/project master</code></pre>
</div></div>
<div class="paragraph"><p>Then, you run this command:</p></div>
<div class="literalblock">
<div class="content">
-<pre><tt>git request-pull v1.0 https://git.ko.xz/project master</tt></pre>
+<pre><code>git request-pull v1.0 https://git.ko.xz/project master</code></pre>
</div></div>
<div class="paragraph"><p>which will produce a request to the upstream, summarizing the
-changes between the <tt>v1.0</tt> release and your <tt>master</tt>, to pull it
+changes between the <code>v1.0</code> release and your <code>master</code>, to pull it
from your public repository.</p></div>
<div class="paragraph"><p>If you pushed your change to a branch whose name is different from
the one you have locally, e.g.</p></div>
<div class="literalblock">
<div class="content">
-<pre><tt>git push https://git.ko.xz/project master:for-linus</tt></pre>
+<pre><code>git push https://git.ko.xz/project master:for-linus</code></pre>
</div></div>
<div class="paragraph"><p>then you can ask that to be pulled with</p></div>
<div class="literalblock">
<div class="content">
-<pre><tt>git request-pull v1.0 https://git.ko.xz/project master:for-linus</tt></pre>
+<pre><code>git request-pull v1.0 https://git.ko.xz/project master:for-linus</code></pre>
</div></div>
</div>
</div>