diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-12-18 16:43:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-12-18 16:43:11 -0800 |
| commit | 9d9711544dc3090db6e5c52f9ce9c300bf4f5c14 (patch) | |
| tree | 23257b9801739fd96c9e82ef98a17500dce9f88e /git-pull.html | |
| parent | 9629d4f49e5ffcff5c5beb5c40bedcffcabcd905 (diff) | |
| download | git-htmldocs-9d9711544dc3090db6e5c52f9ce9c300bf4f5c14.tar.gz | |
Autogenerated HTML docs for v1.8.1-rc2-5-g252f9
Diffstat (limited to 'git-pull.html')
| -rw-r--r-- | git-pull.html | 642 |
1 files changed, 418 insertions, 224 deletions
diff --git a/git-pull.html b/git-pull.html index 393892794..7cb375511 100644 --- a/git-pull.html +++ b/git-pull.html @@ -2,15 +2,25 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.5.2" />
+<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
+<meta name="generator" content="AsciiDoc 8.6.8" />
<title>git-pull(1)</title>
<style type="text/css">
-/* Debug borders */
-p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
-/*
- border: 1px solid red;
-*/
+/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
+
+/* Default font. */
+body {
+ font-family: Georgia,serif;
+}
+
+/* Title font. */
+h1, h2, h3, h4, h5, h6,
+div.title, caption.title,
+thead, p.table.header,
+#toctitle,
+#author, #revnumber, #revdate, #revremark,
+#footer {
+ font-family: Arial,Helvetica,sans-serif;
}
body {
@@ -35,13 +45,8 @@ strong { color: #083194;
}
-tt {
- color: navy;
-}
-
h1, h2, h3, h4, h5, h6 {
color: #527bbd;
- font-family: sans-serif;
margin-top: 1.2em;
margin-bottom: 0.5em;
line-height: 1.3;
@@ -59,9 +64,11 @@ h3 { h3 + * {
clear: left;
}
+h5 {
+ font-size: 1.0em;
+}
div.sectionbody {
- font-family: serif;
margin-left: 0;
}
@@ -77,45 +84,48 @@ p { ul, ol, li > p {
margin-top: 0;
}
+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;
}
-span#author {
+
+#author {
color: #527bbd;
- font-family: sans-serif;
font-weight: bold;
font-size: 1.1em;
}
-span#email {
+#email {
}
-span#revnumber, span#revdate, span#revremark {
- font-family: sans-serif;
+#revnumber, #revdate, #revremark {
}
-div#footer {
- font-family: sans-serif;
+#footer {
font-size: small;
border-top: 2px solid silver;
padding-top: 0.5em;
margin-top: 4.0em;
}
-div#footer-text {
+#footer-text {
float: left;
padding-bottom: 0.5em;
}
-div#footer-badges {
+#footer-badges {
float: right;
padding-bottom: 0.5em;
}
-div#preamble {
+#preamble {
margin-top: 1.5em;
margin-bottom: 1.5em;
}
-div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
+div.imageblock, div.exampleblock, div.verseblock,
div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
div.admonitionblock {
margin-top: 1.0em;
@@ -135,7 +145,6 @@ div.content { /* Block element content. */ /* Block element titles. */
div.title, caption.title {
color: #527bbd;
- font-family: sans-serif;
font-weight: bold;
text-align: left;
margin-top: 1.0em;
@@ -157,13 +166,15 @@ div.content + div.title { div.sidebarblock > div.content {
background: #ffffee;
- border: 1px solid silver;
+ border: 1px solid #dddddd;
+ border-left: 4px solid #f0f0f0;
padding: 0.5em;
}
div.listingblock > div.content {
- border: 1px solid silver;
- background: #f4f4f4;
+ border: 1px solid #dddddd;
+ border-left: 5px solid #f0f0f0;
+ background: #f8f8f8;
padding: 0.5em;
}
@@ -171,8 +182,8 @@ div.quoteblock, div.verseblock { padding-left: 1.0em;
margin-left: 1.0em;
margin-right: 10%;
- border-left: 5px solid #dddddd;
- color: #777777;
+ border-left: 5px solid #f0f0f0;
+ color: #888;
}
div.quoteblock > div.attribution {
@@ -180,8 +191,9 @@ div.quoteblock > div.attribution { text-align: right;
}
-div.verseblock > div.content {
- white-space: pre;
+div.verseblock > pre.content {
+ font-family: inherit;
+ font-size: inherit;
}
div.verseblock > div.attribution {
padding-top: 0.75em;
@@ -254,35 +266,12 @@ div.compact div, div.compact div { margin-bottom: 0.1em;
}
-div.tableblock > table {
- border: 3px solid #527bbd;
-}
-thead, p.table.header {
- font-family: sans-serif;
- font-weight: bold;
-}
tfoot {
font-weight: bold;
}
td > div.verse {
white-space: pre;
}
-p.table {
- margin-top: 0;
-}
-/* Because the table frame attribute is overriden by CSS in most browsers. */
-div.tableblock > table[frame="void"] {
- border-style: none;
-}
-div.tableblock > table[frame="hsides"] {
- border-left-style: none;
- border-right-style: none;
-}
-div.tableblock > table[frame="vsides"] {
- border-top-style: none;
- border-bottom-style: none;
-}
-
div.hdlist {
margin-top: 0.8em;
@@ -339,25 +328,32 @@ span.footnote, span.footnoteref { min-width: 100px;
}
+div.colist td {
+ padding-right: 0.5em;
+ padding-bottom: 0.3em;
+ vertical-align: top;
+}
+div.colist td img {
+ margin-top: 0.3em;
+}
@media print {
- div#footer-badges { display: none; }
+ #footer-badges { display: none; }
}
-div#toc {
+#toc {
margin-bottom: 2.5em;
}
-div#toctitle {
+#toctitle {
color: #527bbd;
- font-family: sans-serif;
font-size: 1.1em;
font-weight: bold;
margin-top: 1.0em;
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;
}
@@ -373,69 +369,173 @@ div.toclevel4 { margin-left: 6em;
font-size: 0.9em;
}
-/* Overrides for manpage documents */
-h1 {
- padding-top: 0.5em;
- padding-bottom: 0.5em;
- border-top: 2px solid silver;
- border-bottom: 2px solid silver;
+
+span.aqua { color: aqua; }
+span.black { color: black; }
+span.blue { color: blue; }
+span.fuchsia { color: fuchsia; }
+span.gray { color: gray; }
+span.green { color: green; }
+span.lime { color: lime; }
+span.maroon { color: maroon; }
+span.navy { color: navy; }
+span.olive { color: olive; }
+span.purple { color: purple; }
+span.red { color: red; }
+span.silver { color: silver; }
+span.teal { color: teal; }
+span.white { color: white; }
+span.yellow { color: yellow; }
+
+span.aqua-background { background: aqua; }
+span.black-background { background: black; }
+span.blue-background { background: blue; }
+span.fuchsia-background { background: fuchsia; }
+span.gray-background { background: gray; }
+span.green-background { background: green; }
+span.lime-background { background: lime; }
+span.maroon-background { background: maroon; }
+span.navy-background { background: navy; }
+span.olive-background { background: olive; }
+span.purple-background { background: purple; }
+span.red-background { background: red; }
+span.silver-background { background: silver; }
+span.teal-background { background: teal; }
+span.white-background { background: white; }
+span.yellow-background { background: yellow; }
+
+span.big { font-size: 2em; }
+span.small { font-size: 0.6em; }
+
+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
+ *
+ * */
+
+div.tableblock {
+ margin-top: 1.0em;
+ margin-bottom: 1.5em;
}
-h2 {
+div.tableblock > table {
+ border: 3px solid #527bbd;
+}
+thead, p.table.header {
+ font-weight: bold;
+ color: #527bbd;
+}
+p.table {
+ margin-top: 0;
+}
+/* Because the table frame attribute is overriden by CSS in most browsers. */
+div.tableblock > table[frame="void"] {
border-style: none;
}
-div.sectionbody {
- margin-left: 5%;
+div.tableblock > table[frame="hsides"] {
+ border-left-style: none;
+ border-right-style: none;
}
-
-@media print {
- div#toc { display: none; }
+div.tableblock > table[frame="vsides"] {
+ border-top-style: none;
+ border-bottom-style: none;
}
-/* Workarounds for IE6's broken and incomplete CSS2. */
-div.sidebar-content {
- background: #ffffee;
- border: 1px solid silver;
- padding: 0.5em;
+/*
+ * html5 specific
+ *
+ * */
+
+table.tableblock {
+ margin-top: 1.0em;
+ margin-bottom: 1.5em;
}
-div.sidebar-title, div.image-title {
- color: #527bbd;
- font-family: sans-serif;
+thead, p.tableblock.header {
font-weight: bold;
- margin-top: 0.0em;
- margin-bottom: 0.5em;
+ color: #527bbd;
+}
+p.tableblock {
+ margin-top: 0;
+}
+table.tableblock {
+ border-width: 3px;
+ border-spacing: 0px;
+ border-style: solid;
+ border-color: #527bbd;
+ border-collapse: collapse;
+}
+th.tableblock, td.tableblock {
+ border-width: 1px;
+ padding: 4px;
+ border-style: solid;
+ border-color: #527bbd;
}
-div.listingblock div.content {
- border: 1px solid silver;
- background: #f4f4f4;
- padding: 0.5em;
+table.tableblock.frame-topbot {
+ border-left-style: hidden;
+ border-right-style: hidden;
+}
+table.tableblock.frame-sides {
+ border-top-style: hidden;
+ border-bottom-style: hidden;
+}
+table.tableblock.frame-none {
+ border-style: hidden;
}
-div.quoteblock-attribution {
- padding-top: 0.5em;
+th.tableblock.halign-left, td.tableblock.halign-left {
+ text-align: left;
+}
+th.tableblock.halign-center, td.tableblock.halign-center {
+ text-align: center;
+}
+th.tableblock.halign-right, td.tableblock.halign-right {
text-align: right;
}
-div.verseblock-content {
- white-space: pre;
+th.tableblock.valign-top, td.tableblock.valign-top {
+ vertical-align: top;
}
-div.verseblock-attribution {
- padding-top: 0.75em;
- text-align: left;
+th.tableblock.valign-middle, td.tableblock.valign-middle {
+ vertical-align: middle;
+}
+th.tableblock.valign-bottom, td.tableblock.valign-bottom {
+ vertical-align: bottom;
}
-div.exampleblock-content {
- border-left: 3px solid #dddddd;
- padding-left: 0.5em;
+
+/*
+ * manpage specific
+ *
+ * */
+
+body.manpage h1 {
+ padding-top: 0.5em;
+ padding-bottom: 0.5em;
+ border-top: 2px solid silver;
+ border-bottom: 2px solid silver;
+}
+body.manpage h2 {
+ border-style: none;
+}
+body.manpage div.sectionbody {
+ margin-left: 3em;
+}
+
+@media print {
+ body.manpage div#toc { display: none; }
}
-/* IE6 sets dynamically generated links as visited. */
-div#toc a:visited { color: blue; }
+
</style>
<script type="text/javascript">
/*<+'])');
+ 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).
@@ -497,6 +597,25 @@ toc: function (toclevels) { }
var toc = document.getElementById("toc");
+ if (!toc) {
+ return;
+ }
+
+ // Delete existing TOC entries in case we're reloading the TOC.
+ var tocEntriesToRemove = [];
+ var i;
+ for (i = 0; i < toc.childNodes.length; i++) {
+ var entry = toc.childNodes[i];
+ if (entry.nodeName.toLowerCase() == 'div'
+ && entry.getAttribute("class")
+ && entry.getAttribute("class").match(/^toclevel/))
+ tocEntriesToRemove.push(entry);
+ }
+ for (i = 0; i < tocEntriesToRemove.length; i++) {
+ toc.removeChild(tocEntriesToRemove[i]);
+ }
+
+ // Rebuild TOC entries.
var entries = tocEntries(document.getElementById("content"), toclevels);
for (var i = 0; i < entries.length; ++i) {
var entry = entries[i];
@@ -524,24 +643,44 @@ toc: function (toclevels) { */
footnotes: function () {
- var cont = document.getElementById("content");
+ // Delete existing footnote entries in case we're reloading the footnodes.
+ var i;
var noteholder = document.getElementById("footnotes");
+ if (!noteholder) {
+ return;
+ }
+ var entriesToRemove = [];
+ for (i = 0; i < noteholder.childNodes.length; i++) {
+ var entry = noteholder.childNodes[i];
+ if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
+ entriesToRemove.push(entry);
+ }
+ for (i = 0; i < entriesToRemove.length; i++) {
+ noteholder.removeChild(entriesToRemove[i]);
+ }
+
+ // Rebuild footnote entries.
+ var cont = document.getElementById("content");
var spans = cont.getElementsByTagName("span");
var refs = {};
var n = 0;
for (i=0; i<spans.length; i++) {
if (spans[i].className == "footnote") {
n++;
- // Use [\s\S] in place of . so multi-line matches work.
- // Because JavaScript has no s (dotall) regex flag.
- note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
+ var note = spans[i].getAttribute("data-note");
+ if (!note) {
+ // Use [\s\S] in place of . so multi-line matches work.
+ // Because JavaScript has no s (dotall) regex flag.
+ note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
+ spans[i].innerHTML =
+ "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
+ "' title='View footnote' class='footnote'>" + n + "</a>]";
+ spans[i].setAttribute("data-note", note);
+ }
noteholder.innerHTML +=
"<div class='footnote' id='_footnote_" + n + "'>" +
"<a href='#_footnoteref_" + n + "' title='Return to text'>" +
n + "</a>. " + note + "</div>";
- spans[i].innerHTML =
- "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
- "' title='View footnote' class='footnote'>" + n + "</a>]";
var id =spans[i].getAttribute("id");
if (id != null) refs["#"+id] = n;
}
@@ -561,13 +700,36 @@ footnotes: function () { }
}
}
+},
+
+install: function(toclevels) {
+ var timerId;
+
+ function reinstall() {
+ asciidoc.footnotes();
+ if (toclevels) {
+ asciidoc.toc(toclevels);
+ }
+ }
+
+ function reinstallAndRemoveTimer() {
+ clearInterval(timerId);
+ reinstall();
+ }
+
+ timerId = setInterval(reinstall, 500);
+ if (document.addEventListener)
+ document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
+ else
+ window.onload = reinstallAndRemoveTimer;
}
}
+asciidoc.install();
/*]]>*/
</script>
</head>
-<body>
+<body class="manpage">
<div id="header">
<h1>
git-pull(1) Manual Page
@@ -580,22 +742,25 @@ git-pull(1) Manual Page </div>
</div>
<div id="content">
+<div class="sect1">
<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="verseblock-content"><em>git pull</em> [options] [<repository> [<refspec>…]]</div>
-<div class="verseblock-attribution">
+<pre class="content"><em>git pull</em> [options] [<repository> [<refspec>…]]</pre>
+<div class="attribution">
</div></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
<div class="paragraph"><p>Incorporates changes from a remote repository into the current
-branch. In its default mode, <tt>git pull</tt> is shorthand for
-<tt>git fetch</tt> followed by <tt>git merge FETCH_HEAD</tt>.</p></div>
+branch. In its default mode, <code>git pull</code> is shorthand for
+<code>git fetch</code> followed by <code>git merge FETCH_HEAD</code>.</p></div>
<div class="paragraph"><p>More precisely, <em>git pull</em> runs <em>git fetch</em> with the given
parameters and calls <em>git merge</em> to merge the retrieved branch
heads into the current branch.
-With <tt>--rebase</tt>, it runs <em>git rebase</em> instead of <em>git merge</em>.</p></div>
+With <code>--rebase</code>, it runs <em>git rebase</em> instead of <em>git merge</em>.</p></div>
<div class="paragraph"><p><repository> should be the name of a remote repository as
passed to <a href="git-fetch.html">git-fetch(1)</a>. <refspec> can name an
arbitrary remote ref (for example, the name of a tag) or even
@@ -604,30 +769,30 @@ a collection of refs with corresponding remote-tracking branches but usually it is the name of a branch in the remote repository.</p></div>
<div class="paragraph"><p>Default values for <repository> and <branch> are read from the
"remote" and "merge" configuration for the current branch
-as set by <a href="git-branch.html">git-branch(1)</a> <tt>--track</tt>.</p></div>
+as set by <a href="git-branch.html">git-branch(1)</a> <code>--track</code>.</p></div>
<div class="paragraph"><p>Assume the following history exists and the current branch is
-"<tt>master</tt>":</p></div>
+"<code>master</code>":</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt> A---B---C master on origin
+<pre><code> A---B---C master on origin
/
- D---E---F---G master</tt></pre>
+ D---E---F---G master</code></pre>
</div></div>
-<div class="paragraph"><p>Then "<tt>git pull</tt>" will fetch and replay the changes from the remote
-<tt>master</tt> branch since it diverged from the local <tt>master</tt> (i.e., <tt>E</tt>)
-until its current commit (<tt>C</tt>) on top of <tt>master</tt> and record the
+<div class="paragraph"><p>Then "<code>git pull</code>" will fetch and replay the changes from the remote
+<code>master</code> branch since it diverged from the local <code>master</code> (i.e., <code>E</code>)
+until its current commit (<code>C</code>) on top of <code>master</code> and record the
result in a new commit along with the names of the two parent commits
and a log message from the user describing the changes.</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt> A---B---C remotes/origin/master
+<pre><code> A---B---C remotes/origin/master
/ \
- D---E---F---G---H master</tt></pre>
+ D---E---F---G---H master</code></pre>
</div></div>
<div class="paragraph"><p>See <a href="git-merge.html">git-merge(1)</a> for details, including how conflicts
are presented and handled.</p></div>
<div class="paragraph"><p>In git 1.7.0 or later, to cancel a conflicting merge, use
-<tt>git reset --merge</tt>. <strong>Warning</strong>: In older versions of git, running <em>git pull</em>
+<code>git reset --merge</code>. <strong>Warning</strong>: In older versions of git, running <em>git pull</em>
with uncommitted changes is discouraged: while possible, it leaves you
in a state that may be hard to back out of in the case of a conflict.</p></div>
<div class="paragraph"><p>If any of the remote changes overlap with local uncommitted changes,
@@ -635,6 +800,8 @@ the merge will be automatically cancelled and the work tree untouched. It is generally best to get any local changes in working order before
pulling or stash them away with <a href="git-stash.html">git-stash(1)</a>.</p></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
<div class="paragraph"><p>Options meant for <em>git pull</em> itself and the underlying <em>git merge</em>
@@ -679,7 +846,8 @@ must be given before the options meant for <em>git fetch</em>.</p></div> </p>
</dd>
</dl></div>
-<h3 id="_options_related_to_merging">Options related to merging</h3><div style="clear:left"></div>
+<div class="sect2">
+<h3 id="_options_related_to_merging">Options related to merging</h3>
<div class="dlist"><dl>
<dt class="hdlist1">
--commit
@@ -706,17 +874,17 @@ inspect and further tweak the merge result before committing.</p></div> <p>
Invoke an editor before committing successful mechanical merge to
further edit the auto-generated merge message, so that the user
- can explain and justify the merge. The <tt>--no-edit</tt> option can be
+ can explain and justify the merge. The <code>--no-edit</code> option can be
used to accept the auto-generated message (this is generally
- discouraged). The <tt>--edit</tt> option is still useful if you are
- giving a draft message with the <tt>-m</tt> option from the command line
+ discouraged). The <code>--edit</code> option is still useful if you are
+ giving a draft message with the <code>-m</code> option from the command line
and want to edit it in the editor.
</p>
<div class="paragraph"><p>Older scripts may depend on the historical behaviour of not allowing the
user to edit the merge log message. They will see an editor opened when
-they run <tt>git merge</tt>. To make it easier to adjust such scripts to the
-updated behaviour, the environment variable <tt>GIT_MERGE_AUTOEDIT</tt> can be
-set to <tt>no</tt> at the beginning of them.</p></div>
+they run <code>git merge</code>. To make it easier to adjust such scripts to the
+updated behaviour, the environment variable <code>GIT_MERGE_AUTOEDIT</code> can be
+set to <code>no</code> at the beginning of them.</p></div>
</dd>
<dt class="hdlist1">
--ff
@@ -743,7 +911,7 @@ set to <tt>no</tt> at the beginning of them.</p></div> <dd>
<p>
Refuse to merge and exit with a non-zero status unless the
- current <tt>HEAD</tt> is already up-to-date or the merge can be
+ current <code>HEAD</code> is already up-to-date or the merge can be
resolved as a fast-forward.
</p>
</dd>
@@ -790,8 +958,8 @@ merge.</p></div> Produce the working tree and index state as if a real
merge happened (except for the merge information),
but do not actually make a commit or
- move the <tt>HEAD</tt>, nor record <tt>$GIT_DIR/MERGE_HEAD</tt> to
- cause the next <tt>git commit</tt> command to create a merge
+ move the <code>HEAD</code>, nor record <code>$GIT_DIR/MERGE_HEAD</code> to
+ cause the next <code>git commit</code> command to create a merge
commit. This allows you to create a single commit on
top of the current branch whose effect is the same as
merging another branch (or more in case of an octopus).
@@ -809,7 +977,7 @@ option can be used to override --squash.</p></div> <p>
Use the given merge strategy; can be supplied more than
once to specify them in the order they should be tried.
- If there is no <tt>-s</tt> option, a built-in list of strategies
+ If there is no <code>-s</code> option, a built-in list of strategies
is used instead (<em>git merge-recursive</em> when merging a single
head, <em>git merge-octopus</em> otherwise).
</p>
@@ -890,9 +1058,9 @@ option can be used to override --squash.</p></div> fetched, the rebase uses that information to avoid rebasing
non-local changes.
</p>
-<div class="paragraph"><p>See <tt>pull.rebase</tt>, <tt>branch.<name>.rebase</tt> and <tt>branch.autosetuprebase</tt> in
-<a href="git-config.html">git-config(1)</a> if you want to make <tt>git pull</tt> always use
-<tt>--rebase</tt> instead of merging.</p></div>
+<div class="paragraph"><p>See <code>pull.rebase</code>, <code>branch.<name>.rebase</code> and <code>branch.autosetuprebase</code> in
+<a href="git-config.html">git-config(1)</a> if you want to make <code>git pull</code> always use
+<code>--rebase</code> instead of merging.</p></div>
<div class="admonitionblock">
<table><tr>
<td class="icon">
@@ -914,7 +1082,9 @@ unless you have read <a href="git-rebase.html">git-rebase(1)</a> carefully.</td> </p>
</dd>
</dl></div>
-<h3 id="_options_related_to_fetching">Options related to fetching</h3><div style="clear:left"></div>
+</div>
+<div class="sect2">
+<h3 id="_options_related_to_fetching">Options related to fetching</h3>
<div class="dlist"><dl>
<dt class="hdlist1">
--all
@@ -933,8 +1103,8 @@ unless you have read <a href="git-rebase.html">git-rebase(1)</a> carefully.</td> <dd>
<p>
Append ref names and object names of fetched refs to the
- existing contents of <tt>.git/FETCH_HEAD</tt>. Without this
- option old data in <tt>.git/FETCH_HEAD</tt> will be overwritten.
+ existing contents of <code>.git/FETCH_HEAD</code>. Without this
+ option old data in <code>.git/FETCH_HEAD</code> will be overwritten.
</p>
</dd>
<dt class="hdlist1">
@@ -943,7 +1113,7 @@ unless you have read <a href="git-rebase.html">git-rebase(1)</a> carefully.</td> <dd>
<p>
Deepen the history of a <em>shallow</em> repository created by
- <tt>git clone</tt> with <tt>--depth=<depth></tt> option (see <a href="git-clone.html">git-clone(1)</a>)
+ <code>git clone</code> with <code>--depth=<depth></code> option (see <a href="git-clone.html">git-clone(1)</a>)
to the specified number of commits from the tip of each remote
branch history. Tags for the deepened commits are not fetched.
</p>
@@ -956,10 +1126,10 @@ unless you have read <a href="git-rebase.html">git-rebase(1)</a> carefully.</td> </dt>
<dd>
<p>
- When <em>git fetch</em> is used with <tt><rbranch>:<lbranch></tt>
+ When <em>git fetch</em> is used with <code><rbranch>:<lbranch></code>
refspec, it refuses to update the local branch
- <tt><lbranch></tt> unless the remote branch <tt><rbranch></tt> it
- fetches is a descendant of <tt><lbranch></tt>. This option
+ <code><lbranch></code> unless the remote branch <code><rbranch></code> it
+ fetches is a descendant of <code><lbranch></code>. This option
overrides that check.
</p>
</dd>
@@ -1041,13 +1211,13 @@ unless you have read <a href="git-rebase.html">git-rebase(1)</a> carefully.</td> <dd>
<p>
The format of a <refspec> parameter is an optional plus
- <tt>+</tt>, followed by the source ref <src>, followed
- by a colon <tt>:</tt>, followed by the destination ref <dst>.
+ <code>+</code>, followed by the source ref <src>, followed
+ by a colon <code>:</code>, followed by the destination ref <dst>.
</p>
<div class="paragraph"><p>The remote ref that matches <src>
is fetched, and if <dst> is not empty string, the local
ref that matches it is fast-forwarded using <src>.
-If the optional plus <tt>+</tt> is used, the local ref
+If the optional plus <code>+</code> is used, the local ref
is updated even if it does not result in a fast-forward
update.</p></div>
<div class="admonitionblock">
@@ -1060,7 +1230,7 @@ modified in non-linear ways such as being rewound and rebased frequently, then a pull will attempt a merge with
an older version of itself, likely conflict, and fail.
It is under these conditions that you would want to use
-the <tt>+</tt> sign to indicate non-fast-forward updates will
+the <code>+</code> sign to indicate non-fast-forward updates will
be needed. There is currently no easy way to determine
or declare that a branch will be made available in a
repository with this behavior; the pulling user simply
@@ -1073,16 +1243,16 @@ must know this is the expected usage pattern for a branch.</td> <div class="title">Note</div>
</td>
<td class="content">You never do your own development on branches that appear
-on the right hand side of a <refspec> colon on <tt>Pull:</tt> lines;
+on the right hand side of a <refspec> colon on <code>Pull:</code> lines;
they are to be updated by <em>git fetch</em>. If you intend to do
-development derived from a remote branch <tt>B</tt>, have a <tt>Pull:</tt>
-line to track it (i.e. <tt>Pull: B:remote-B</tt>), and have a separate
-branch <tt>my-B</tt> to do your development on top of it. The latter
-is created by <tt>git branch my-B remote-B</tt> (or its equivalent <tt>git
-checkout -b my-B remote-B</tt>). Run <tt>git fetch</tt> to keep track of
+development derived from a remote branch <code>B</code>, have a <code>Pull:</code>
+line to track it (i.e. <code>Pull: B:remote-B</code>), and have a separate
+branch <code>my-B</code> to do your development on top of it. The latter
+is created by <code>git branch my-B remote-B</code> (or its equivalent <code>git
+checkout -b my-B remote-B</code>). Run <code>git fetch</code> to keep track of
the progress of the remote side, and when you see something new
on the remote branch, merge it into your development branch with
-<tt>git pull . remote-B</tt>, while you are on <tt>my-B</tt> branch.</td>
+<code>git pull . remote-B</code>, while you are on <code>my-B</code> branch.</td>
</tr></table>
</div>
<div class="admonitionblock">
@@ -1092,13 +1262,13 @@ on the remote branch, merge it into your development branch with </td>
<td class="content">There is a difference between listing multiple <refspec>
directly on <em>git pull</em> command line and having multiple
-<tt>Pull:</tt> <refspec> lines for a <repository> and running
+<code>Pull:</code> <refspec> lines for a <repository> and running
<em>git pull</em> command without any explicit <refspec> parameters.
<refspec> listed explicitly on the command line are always
merged into the current branch after fetching. In other words,
if you list more than one remote refs, you would be making
an Octopus. While <em>git pull</em> run without any explicit <refspec>
-parameter takes default <refspec>s from <tt>Pull:</tt> lines, it
+parameter takes default <refspec>s from <code>Pull:</code> lines, it
merges only the first <refspec> found into the current branch,
after fetching all the remote refs. This is because making an
Octopus from remote refs is rarely done, while keeping track
@@ -1110,7 +1280,7 @@ is often useful.</td> <div class="ulist"><ul>
<li>
<p>
-<tt>tag <tag></tt> means the same as <tt>refs/tags/<tag>:refs/tags/<tag></tt>;
+<code>tag <tag></code> means the same as <code>refs/tags/<tag>:refs/tags/<tag></code>;
it requests fetching everything up to the given tag.
</p>
</li>
@@ -1125,6 +1295,9 @@ A parameter <ref> without a colon is equivalent to </dd>
</dl></div>
</div>
+</div>
+</div>
+<div class="sect1">
<h2 id="_git_urls_a_id_urls_a">GIT URLS<a id="URLS"></a></h2>
<div class="sectionbody">
<div class="paragraph"><p>In general, URLs contain information about the transport protocol, the
@@ -1226,15 +1399,15 @@ use will be rewritten into URLs that work), you can create a configuration section of the form:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt> [url "<actual url base>"]
- insteadOf = <other url base></tt></pre>
+<pre><code> [url "<actual url base>"]
+ insteadOf = <other url base></code></pre>
</div></div>
<div class="paragraph"><p>For example, with this:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt> [url "git://git.host.xz/"]
+<pre><code> [url "git://git.host.xz/"]
insteadOf = host.xz:/path/to/
- insteadOf = work:</tt></pre>
+ insteadOf = work:</code></pre>
</div></div>
<div class="paragraph"><p>a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be
rewritten in any context that takes a URL to be "git://git.host.xz/repo.git".</p></div>
@@ -1242,107 +1415,117 @@ rewritten in any context that takes a URL to be "git://git.host.xz/repo.git".</p configuration section of the form:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt> [url "<actual url base>"]
- pushInsteadOf = <other url base></tt></pre>
+<pre><code> [url "<actual url base>"]
+ pushInsteadOf = <other url base></code></pre>
</div></div>
<div class="paragraph"><p>For example, with this:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt> [url "ssh://example.org/"]
- pushInsteadOf = git://example.org/</tt></pre>
+<pre><code> [url "ssh://example.org/"]
+ pushInsteadOf = git://example.org/</code></pre>
</div></div>
<div class="paragraph"><p>a URL like "git://example.org/path/to/repo.git" will be rewritten to
"ssh://example.org/path/to/repo.git" for pushes, but pulls will still
use the original URL.</p></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_remotes_a_id_remotes_a">REMOTES<a id="REMOTES"></a></h2>
<div class="sectionbody">
<div class="paragraph"><p>The name of one of the following can be used instead
-of a URL as <tt><repository></tt> argument:</p></div>
+of a URL as <code><repository></code> argument:</p></div>
<div class="ulist"><ul>
<li>
<p>
-a remote in the git configuration file: <tt>$GIT_DIR/config</tt>,
+a remote in the git configuration file: <code>$GIT_DIR/config</code>,
</p>
</li>
<li>
<p>
-a file in the <tt>$GIT_DIR/remotes</tt> directory, or
+a file in the <code>$GIT_DIR/remotes</code> directory, or
</p>
</li>
<li>
<p>
-a file in the <tt>$GIT_DIR/branches</tt> directory.
+a file in the <code>$GIT_DIR/branches</code> directory.
</p>
</li>
</ul></div>
<div class="paragraph"><p>All of these also allow you to omit the refspec from the command line
because they each contain a refspec which git will use by default.</p></div>
-<h3 id="_named_remote_in_configuration_file">Named remote in configuration file</h3><div style="clear:left"></div>
+<div class="sect2">
+<h3 id="_named_remote_in_configuration_file">Named remote in configuration file</h3>
<div class="paragraph"><p>You can choose to provide the name of a remote which you had previously
configured using <a href="git-remote.html">git-remote(1)</a>, <a href="git-config.html">git-config(1)</a>
-or even by a manual edit to the <tt>$GIT_DIR/config</tt> file. The URL of
+or even by a manual edit to the <code>$GIT_DIR/config</code> file. The URL of
this remote will be used to access the repository. The refspec
of this remote will be used by default when you do
not provide a refspec on the command line. The entry in the
config file would appear like this:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt> [remote "<name>"]
+<pre><code> [remote "<name>"]
url = <url>
pushurl = <pushurl>
push = <refspec>
- fetch = <refspec></tt></pre>
+ fetch = <refspec></code></pre>
</div></div>
-<div class="paragraph"><p>The <tt><pushurl></tt> is used for pushes only. It is optional and defaults
-to <tt><url></tt>.</p></div>
-<h3 id="_named_file_in_tt_git_dir_remotes_tt">Named file in <tt>$GIT_DIR/remotes</tt></h3><div style="clear:left"></div>
+<div class="paragraph"><p>The <code><pushurl></code> is used for pushes only. It is optional and defaults
+to <code><url></code>.</p></div>
+</div>
+<div class="sect2">
+<h3 id="_named_file_in_code_git_dir_remotes_code">Named file in <code>$GIT_DIR/remotes</code></h3>
<div class="paragraph"><p>You can choose to provide the name of a
-file in <tt>$GIT_DIR/remotes</tt>. The URL
+file in <code>$GIT_DIR/remotes</code>. The URL
in this file will be used to access the repository. The refspec
in this file will be used as default when you do not
provide a refspec on the command line. This file should have the
following format:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt> URL: one of the above URL format
+<pre><code> URL: one of the above URL format
Push: <refspec>
- Pull: <refspec></tt></pre>
+ Pull: <refspec></code></pre>
</div></div>
-<div class="paragraph"><p><tt>Push:</tt> lines are used by <em>git push</em> and
-<tt>Pull:</tt> lines are used by <em>git pull</em> and <em>git fetch</em>.
-Multiple <tt>Push:</tt> and <tt>Pull:</tt> lines may
+<div class="paragraph"><p><code>Push:</code> lines are used by <em>git push</em> and
+<code>Pull:</code> lines are used by <em>git pull</em> and <em>git fetch</em>.
+Multiple <code>Push:</code> and <code>Pull:</code> lines may
be specified for additional branch mappings.</p></div>
-<h3 id="_named_file_in_tt_git_dir_branches_tt">Named file in <tt>$GIT_DIR/branches</tt></h3><div style="clear:left"></div>
+</div>
+<div class="sect2">
+<h3 id="_named_file_in_code_git_dir_branches_code">Named file in <code>$GIT_DIR/branches</code></h3>
<div class="paragraph"><p>You can choose to provide the name of a
-file in <tt>$GIT_DIR/branches</tt>.
+file in <code>$GIT_DIR/branches</code>.
The URL in this file will be used to access the repository.
This file should have the following format:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt> <url>#<head></tt></pre>
+<pre><code> <url>#<head></code></pre>
</div></div>
-<div class="paragraph"><p><tt><url></tt> is required; <tt>#<head></tt> is optional.</p></div>
+<div class="paragraph"><p><code><url></code> is required; <code>#<head></code> is optional.</p></div>
<div class="paragraph"><p>Depending on the operation, git will use one of the following
refspecs, if you don’t provide one on the command line.
-<tt><branch></tt> is the name of this file in <tt>$GIT_DIR/branches</tt> and
-<tt><head></tt> defaults to <tt>master</tt>.</p></div>
+<code><branch></code> is the name of this file in <code>$GIT_DIR/branches</code> and
+<code><head></code> defaults to <code>master</code>.</p></div>
<div class="paragraph"><p>git fetch uses:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt> refs/heads/<head>:refs/heads/<branch></tt></pre>
+<pre><code> refs/heads/<head>:refs/heads/<branch></code></pre>
</div></div>
<div class="paragraph"><p>git push uses:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt> HEAD:refs/heads/<head></tt></pre>
+<pre><code> HEAD:refs/heads/<head></code></pre>
</div></div>
</div>
+</div>
+</div>
+<div class="sect1">
<h2 id="_merge_strategies">MERGE STRATEGIES</h2>
<div class="sectionbody">
<div class="paragraph"><p>The merge mechanism (<em>git-merge</em> and <em>git-pull</em> commands) allows the
-backend <em>merge strategies</em> to be chosen with <tt>-s</tt> option. Some strategies
-can also take their own options, which can be passed by giving <tt>-X<option></tt>
+backend <em>merge strategies</em> to be chosen with <code>-s</code> option. Some strategies
+can also take their own options, which can be passed by giving <code>-X<option></code>
arguments to <em>git-merge</em> and/or <em>git-pull</em>.</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
@@ -1407,7 +1590,7 @@ patience to avoid mismerges that sometimes occur due to unimportant
matching lines (e.g., braces from distinct functions). Use
this when the branches to be merged have diverged wildly.
- See also <a href="git-diff.html">git-diff(1)</a> <tt>--patience</tt>.
+ See also <a href="git-diff.html">git-diff(1)</a> <code>--patience</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -1424,8 +1607,8 @@ ignore-space-at-eol Treats lines with the indicated type of whitespace change as
unchanged for the sake of a three-way merge. Whitespace
changes mixed with other changes to a line are not ignored.
- See also <a href="git-diff.html">git-diff(1)</a> <tt>-b</tt>, <tt>-w</tt>, and
- <tt>--ignore-space-at-eol</tt>.
+ See also <a href="git-diff.html">git-diff(1)</a> <code>-b</code>, <code>-w</code>, and
+ <code>--ignore-space-at-eol</code>.
</p>
<div class="ulist"><ul>
<li>
@@ -1465,8 +1648,8 @@ no-renormalize </dt>
<dd>
<p>
- Disables the <tt>renormalize</tt> option. This overrides the
- <tt>merge.renormalize</tt> configuration variable.
+ Disables the <code>renormalize</code> option. This overrides the
+ <code>merge.renormalize</code> configuration variable.
</p>
</dd>
<dt class="hdlist1">
@@ -1475,7 +1658,7 @@ rename-threshold=<n> <dd>
<p>
Controls the similarity threshold used for rename detection.
- See also <a href="git-diff.html">git-diff(1)</a> <tt>-M</tt>.
+ See also <a href="git-diff.html">git-diff(1)</a> <code>-M</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -1531,48 +1714,50 @@ subtree </dd>
</dl></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_default_behaviour">DEFAULT BEHAVIOUR</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Often people use <tt>git pull</tt> without giving any parameter.
-Traditionally, this has been equivalent to saying <tt>git pull
-origin</tt>. However, when configuration <tt>branch.<name>.remote</tt> is
-present while on branch <tt><name></tt>, that value is used instead of
-<tt>origin</tt>.</p></div>
+<div class="paragraph"><p>Often people use <code>git pull</code> without giving any parameter.
+Traditionally, this has been equivalent to saying <code>git pull
+origin</code>. However, when configuration <code>branch.<name>.remote</code> is
+present while on branch <code><name></code>, that value is used instead of
+<code>origin</code>.</p></div>
<div class="paragraph"><p>In order to determine what URL to use to fetch from, the value
-of the configuration <tt>remote.<origin>.url</tt> is consulted
-and if there is not any such variable, the value on <tt>URL: ` line
-in `$GIT_DIR/remotes/<origin></tt> file is used.</p></div>
+of the configuration <code>remote.<origin>.url</code> is consulted
+and if there is not any such variable, the value on <code>URL: ` line
+in `$GIT_DIR/remotes/<origin></code> file is used.</p></div>
<div class="paragraph"><p>In order to determine what remote branches to fetch (and
optionally store in the remote-tracking branches) when the command is
run without any refspec parameters on the command line, values
-of the configuration variable <tt>remote.<origin>.fetch</tt> are
-consulted, and if there aren’t any, <tt>$GIT_DIR/remotes/<origin></tt>
+of the configuration variable <code>remote.<origin>.fetch</code> are
+consulted, and if there aren’t any, <code>$GIT_DIR/remotes/<origin></code>
file is consulted and its `Pull: ` lines are used.
In addition to the refspec formats described in the OPTIONS
section, you can have a globbing refspec that looks like this:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>refs/heads/*:refs/remotes/origin/*</tt></pre>
+<pre><code>refs/heads/*:refs/remotes/origin/*</code></pre>
</div></div>
<div class="paragraph"><p>A globbing refspec must have a non-empty RHS (i.e. must store
what were fetched in remote-tracking branches), and its LHS and RHS
-must end with <tt>/*</tt>. The above specifies that all remote
+must end with <code>/*</code>. The above specifies that all remote
branches are tracked using remote-tracking branches in
-<tt>refs/remotes/origin/</tt> hierarchy under the same name.</p></div>
+<code>refs/remotes/origin/</code> hierarchy under the same name.</p></div>
<div class="paragraph"><p>The rule to determine which remote branch to merge after
fetching is a bit involved, in order not to break backward
compatibility.</p></div>
<div class="paragraph"><p>If explicit refspecs were given on the command
-line of <tt>git pull</tt>, they are all merged.</p></div>
-<div class="paragraph"><p>When no refspec was given on the command line, then <tt>git pull</tt>
+line of <code>git pull</code>, they are all merged.</p></div>
+<div class="paragraph"><p>When no refspec was given on the command line, then <code>git pull</code>
uses the refspec from the configuration or
-<tt>$GIT_DIR/remotes/<origin></tt>. In such cases, the following
+<code>$GIT_DIR/remotes/<origin></code>. In such cases, the following
rules apply:</p></div>
<div class="olist arabic"><ol class="arabic">
<li>
<p>
-If <tt>branch.<name>.merge</tt> configuration for the current
- branch <tt><name></tt> exists, that is the name of the branch at the
+If <code>branch.<name>.merge</code> configuration for the current
+ branch <code><name></code> exists, that is the name of the branch at the
remote site that is merged.
</p>
</li>
@@ -1588,6 +1773,8 @@ Otherwise the remote branch of the first refspec is merged. </li>
</ol></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_examples">EXAMPLES</h2>
<div class="sectionbody">
<div class="ulist"><ul>
@@ -1599,7 +1786,7 @@ Update the remote-tracking branches for the repository </p>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git pull, git pull origin</tt></pre>
+<pre><code>$ git pull, git pull origin</code></pre>
</div></div>
<div class="paragraph"><p>Normally the branch merged in is the HEAD of the remote repository,
but the choice is determined by the branch.<name>.remote and
@@ -1607,25 +1794,27 @@ branch.<name>.merge options; see <a href="git-config.html">git-config(1)</ </li>
<li>
<p>
-Merge into the current branch the remote branch <tt>next</tt>:
+Merge into the current branch the remote branch <code>next</code>:
</p>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git pull origin next</tt></pre>
+<pre><code>$ git pull origin next</code></pre>
</div></div>
-<div class="paragraph"><p>This leaves a copy of <tt>next</tt> temporarily in FETCH_HEAD, but
+<div class="paragraph"><p>This leaves a copy of <code>next</code> temporarily in FETCH_HEAD, but
does not update any remote-tracking branches. Using remote-tracking
branches, the same can be done by invoking fetch and merge:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git fetch origin
-$ git merge origin/next</tt></pre>
+<pre><code>$ git fetch origin
+$ git merge origin/next</code></pre>
</div></div>
</li>
</ul></div>
<div class="paragraph"><p>If you tried a pull which resulted in a complex conflicts and
would want to start over, you can recover with <em>git reset</em>.</p></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_bugs">BUGS</h2>
<div class="sectionbody">
<div class="paragraph"><p>Using --recurse-submodules can only fetch new commits in already checked
@@ -1635,15 +1824,20 @@ fetched, making it impossible to check out that submodule later without having to do a fetch again. This is expected to be fixed in a future git
version.</p></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
<div class="paragraph"><p><a href="git-fetch.html">git-fetch(1)</a>, <a href="git-merge.html">git-merge(1)</a>, <a href="git-config.html">git-config(1)</a></p></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_git">GIT</h2>
<div class="sectionbody">
<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
</div>
</div>
+</div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
|