diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-07-06 05:20:31 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-07-06 05:20:31 +0000 |
| commit | ba4b9286c25f18c7ebbb809ee5732a7810377ab6 (patch) | |
| tree | 390507328a7564b65dc803683c34235700b97409 /git-pull.html | |
| parent | 05bf9c54a827e48b2b576488f5170a3490b5180e (diff) | |
| download | git-htmldocs-ba4b9286c25f18c7ebbb809ee5732a7810377ab6.tar.gz | |
Autogenerated HTML docs for v1.5.6.2-212-g08b5
Diffstat (limited to 'git-pull.html')
| -rw-r--r-- | git-pull.html | 310 |
1 files changed, 179 insertions, 131 deletions
diff --git a/git-pull.html b/git-pull.html index 61be7a31e..e4538cdc0 100644 --- a/git-pull.html +++ b/git-pull.html @@ -3,7 +3,7 @@ <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 7.0.2" />
+<meta name="generator" content="AsciiDoc 8.2.5" />
<style type="text/css">
/* Debug borders */
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -16,8 +16,13 @@ body { margin: 1em 5% 1em 5%;
}
-a { color: blue; }
-a:visited { color: fuchsia; }
+a {
+ color: blue;
+ text-decoration: underline;
+}
+a:visited {
+ color: fuchsia;
+}
em {
font-style: italic;
@@ -39,13 +44,18 @@ h1, h2, h3, h4, h5, h6 { line-height: 1.3;
}
-h1 {
+h1, h2, h3 {
border-bottom: 2px solid silver;
}
h2 {
- border-bottom: 2px solid silver;
padding-top: 0.5em;
}
+h3 {
+ float: left;
+}
+h3 + * {
+ clear: left;
+}
div.sectionbody {
font-family: serif;
@@ -70,7 +80,7 @@ span#author { color: #527bbd;
font-family: sans-serif;
font-weight: bold;
- font-size: 1.2em;
+ font-size: 1.1em;
}
span#email {
}
@@ -139,6 +149,9 @@ div.sidebarblock > div.content { padding: 0.5em;
}
+div.listingblock {
+ margin-right: 0%;
+}
div.listingblock > div.content {
border: 1px solid silver;
background: #f4f4f4;
@@ -148,9 +161,13 @@ div.listingblock > div.content { div.quoteblock > div.content {
padding-left: 2.0em;
}
-div.quoteblock .attribution {
+
+div.attribution {
text-align: right;
}
+div.verseblock + div.attribution {
+ text-align: left;
+}
div.admonitionblock .icon {
vertical-align: top;
@@ -194,13 +211,12 @@ dd > *:first-child { ul, ol {
list-style-position: outside;
}
-ol.olist2 {
+div.olist2 ol {
list-style-type: lower-alpha;
}
div.tableblock > table {
- border-color: #527bbd;
- border-width: 3px;
+ border: 3px solid #527bbd;
}
thead {
font-family: sans-serif;
@@ -214,6 +230,9 @@ div.hlist { margin-top: 0.8em;
margin-bottom: 0.8em;
}
+div.hlist td {
+ padding-bottom: 5px;
+}
td.hlist1 {
vertical-align: top;
font-style: italic;
@@ -226,7 +245,33 @@ td.hlist2 { @media print {
div#footer-badges { display: none; }
}
-include::./stylesheets/xhtml11-manpage.css[]
+
+div#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 {
+ margin-top: 0;
+ margin-bottom: 0;
+}
+div.toclevel2 {
+ margin-left: 2em;
+ font-size: 0.9em;
+}
+div.toclevel3 {
+ margin-left: 4em;
+ font-size: 0.9em;
+}
+div.toclevel4 {
+ margin-left: 6em;
+ font-size: 0.9em;
+}
+include1::./stylesheets/xhtml11-manpage.css[]
/* Workarounds for IE6's broken and incomplete CSS2. */
div.sidebar-content {
@@ -255,6 +300,9 @@ div.exampleblock-content { border-left: 2px solid silver;
padding-left: 0.5em;
}
+
+/* IE6 sets dynamically generated links as visited. */
+div#toc a:visited { color: blue; }
</style>
<title>git-pull(1)</title>
</head>
@@ -272,22 +320,22 @@ git-pull(1) Manual Page </div>
<h2>SYNOPSIS</h2>
<div class="sectionbody">
-<p><em>git pull</em> <options> <repository> <refspec>…</p>
+<div class="para"><p><em>git pull</em> <options> <repository> <refspec>…</p></div>
</div>
-<h2>DESCRIPTION</h2>
+<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<p>Runs <tt>git-fetch</tt> with the given parameters, and calls <tt>git-merge</tt>
+<div class="para"><p>Runs <em>git-fetch</em> with the given parameters, and calls <em>git-merge</em>
to merge the retrieved head(s) into the current branch.
-With <tt>--rebase</tt>, calls <tt>git-rebase</tt> instead of <tt>git-merge</tt>.</p>
-<p>Note that you can use <tt>.</tt> (current directory) as the
+With <tt>--rebase</tt>, calls <em>git-rebase</em> instead of <em>git-merge</em>.</p></div>
+<div class="para"><p>Note that you can use <tt>.</tt> (current directory) as the
<repository> to pull from the local repository — this is useful
-when merging local branches into the current branch.</p>
-<p>Also note that options meant for <tt>git-pull</tt> itself and underlying
-<tt>git-merge</tt> must be given before the options meant for <tt>git-fetch</tt>.</p>
+when merging local branches into the current branch.</p></div>
+<div class="para"><p>Also note that options meant for <em>git-pull</em> itself and underlying
+<em>git-merge</em> must be given before the options meant for <em>git-fetch</em>.</p></div>
</div>
-<h2>OPTIONS</h2>
+<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
-<dl>
+<div class="vlist"><dl>
<dt>
--stat
</dt>
@@ -411,12 +459,12 @@ when merging local branches into the current branch.</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
- is used instead (<tt>git-merge-recursive</tt> when merging a single
- head, <tt>git-merge-octopus</tt> otherwise).
+ is used instead (<em>git-merge-recursive</em> when merging a single
+ head, <em>git-merge-octopus</em> otherwise).
</p>
</dd>
-</dl>
-<dl>
+</dl></div>
+<div class="vlist"><dl>
<dt>
--rebase
</dt>
@@ -434,7 +482,7 @@ when merging local branches into the current branch.</p> <td class="icon">
<div class="title">Note</div>
</td>
-<td class="content">This is a potentially _dangerous_ mode of operation.
+<td class="content">This is a potentially <em>dangerous</em> mode of operation.
It rewrites history, which does not bode well when you
published that history already. Do <strong>not</strong> use this option
unless you have read <a href="git-rebase.html">git-rebase(1)</a> carefully.</td>
@@ -504,7 +552,7 @@ unless you have read <a href="git-rebase.html">git-rebase(1)</a> carefully.</td> </dt>
<dd>
<p>
- When <tt>git-fetch</tt> is used with <tt><rbranch>:<lbranch></tt>
+ When <em>git-fetch</em> is used with <tt><rbranch>:<lbranch></tt>
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
@@ -556,10 +604,10 @@ unless you have read <a href="git-rebase.html">git-rebase(1)</a> carefully.</td> </dt>
<dd>
<p>
- By default <tt>git-fetch</tt> refuses to update the head which
+ By default <em>git-fetch</em> refuses to update the head which
corresponds to the current branch. This flag disables the
- check. This is purely for the internal use for <tt>git-pull</tt>
- to communicate with <tt>git-fetch</tt>, and unless you are
+ check. This is purely for the internal use for <em>git-pull</em>
+ to communicate with <em>git-fetch</em>, and unless you are
implementing your own Porcelain you are not supposed to
use it.
</p>
@@ -591,16 +639,16 @@ unless you have read <a href="git-rebase.html">git-rebase(1)</a> carefully.</td> <dd>
<p>
The canonical format of a <refspec> parameter is
- <tt>+?<src>:<dst></tt>; that is, an optional plus <tt>+</tt>, followed
+ <tt><tt>?<src>:<dst></tt>; that is, an optional plus <tt></tt></tt>, followed
by the source ref, followed by a colon <tt>:</tt>, followed by
the destination ref.
</p>
-<p>The remote ref that matches <src>
+<div class="para"><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>.
Again, if the optional plus <tt>+</tt> is used, the local ref
is updated even if it does not result in a fast forward
-update.</p>
+update.</p></div>
<div class="admonitionblock">
<table><tr>
<td class="icon">
@@ -625,7 +673,7 @@ must know this is the expected usage pattern for a branch.</td> </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;
-they are to be updated by <tt>git-fetch</tt>. If you intend to do
+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
@@ -642,13 +690,13 @@ on the remote branch, merge it into your development branch with <div class="title">Note</div>
</td>
<td class="content">There is a difference between listing multiple <refspec>
-directly on <tt>git-pull</tt> command line and having multiple
+directly on <em>git-pull</em> command line and having multiple
<tt>Pull:</tt> <refspec> lines for a <repository> and running
-<tt>git-pull</tt> command without any explicit <refspec> parameters.
+<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 <tt>git-pull</tt> run without any explicit <refspec>
+an Octopus. While <em>git-pull</em> run without any explicit <refspec>
parameter takes default <refspec>s from <tt>Pull:</tt> lines, it
merges only the first <refspec> found into the current branch,
after fetching all the remote refs. This is because making an
@@ -657,8 +705,8 @@ of multiple remote heads in one-go by fetching more than one is often useful.</td>
</tr></table>
</div>
-<p>Some short-cut notations are also supported.</p>
-<ul>
+<div class="para"><p>Some short-cut notations are also supported.</p></div>
+<div class="ilist"><ul>
<li>
<p>
<tt>tag <tag></tt> means the same as <tt>refs/tags/<tag>:refs/tags/<tag></tt>;
@@ -672,17 +720,17 @@ A parameter <ref> without a colon is equivalent to branch without storing the remote branch anywhere locally
</p>
</li>
-</ul>
+</ul></div>
</dd>
-</dl>
+</dl></div>
</div>
-<h2>GIT URLS<a id="URLS"></a></h2>
+<h2 id="_git_urls_a_id_urls_a">GIT URLS<a id="URLS"></a></h2>
<div class="sectionbody">
-<p>One of the following notations can be used
-to name the remote repository:</p>
+<div class="para"><p>One of the following notations can be used
+to name the remote repository:</p></div>
<div class="exampleblock">
<div class="exampleblock-content">
-<ul>
+<div class="ilist"><ul>
<li>
<p>
rsync://host.xz/path/to/repo.git/
@@ -728,17 +776,17 @@ ssh://[user@]host.xz/~user/path/to/repo.git/ ssh://[user@]host.xz/~/path/to/repo.git
</p>
</li>
-</ul>
+</ul></div>
</div></div>
-<p>SSH is the default transport protocol over the network. You can
+<div class="para"><p>SSH is the default transport protocol over the network. You can
optionally specify which user to log-in as, and an alternate,
scp-like syntax is also supported. Both syntaxes support
username expansion, as does the native git protocol, but
only the former supports port specification. The following
-three are identical to the last three above, respectively:</p>
+three are identical to the last three above, respectively:</p></div>
<div class="exampleblock">
<div class="exampleblock-content">
-<ul>
+<div class="ilist"><ul>
<li>
<p>
[user@]host.xz:/path/to/repo.git/
@@ -754,12 +802,12 @@ three are identical to the last three above, respectively:</p> [user@]host.xz:path/to/repo.git
</p>
</li>
-</ul>
+</ul></div>
</div></div>
-<p>To sync with a local directory, you can use:</p>
+<div class="para"><p>To sync with a local directory, you can use:</p></div>
<div class="exampleblock">
<div class="exampleblock-content">
-<ul>
+<div class="ilist"><ul>
<li>
<p>
/path/to/repo.git/
@@ -770,34 +818,34 @@ three are identical to the last three above, respectively:</p> file:///path/to/repo.git/
</p>
</li>
-</ul>
+</ul></div>
</div></div>
-<p>They are mostly equivalent, except when cloning. See
-<a href="git-clone.html">git-clone(1)</a> for details.</p>
-<p>If there are a large number of similarly-named remote repositories and
+<div class="para"><p>They are mostly equivalent, except when cloning. See
+<a href="git-clone.html">git-clone(1)</a> for details.</p></div>
+<div class="para"><p>If there are a large number of similarly-named remote repositories and
you want to use a different format for them (such that the URLs you
use will be rewritten into URLs that work), you can create a
-configuration section of the form:</p>
+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>
</div></div>
-<p>For example, with this:</p>
+<div class="para"><p>For example, with this:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt> [url "git://git.host.xz/"]
insteadOf = host.xz:/path/to/
insteadOf = work:</tt></pre>
</div></div>
-<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 class="para"><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>
</div>
-<h2>REMOTES<a id="REMOTES"></a></h2>
+<h2 id="_remotes_a_id_remotes_a">REMOTES<a id="REMOTES"></a></h2>
<div class="sectionbody">
-<p>The name of one of the following can be used instead
-of a URL as <tt><repository></tt> argument:</p>
-<ul>
+<div class="para"><p>The name of one of the following can be used instead
+of a URL as <tt><repository></tt> argument:</p></div>
+<div class="ilist"><ul>
<li>
<p>
a remote in the git configuration file: <tt>$GIT_DIR/config</tt>,
@@ -813,17 +861,17 @@ a file in the <tt>$GIT_DIR/remotes</tt> directory, or a file in the <tt>$GIT_DIR/branches</tt> directory.
</p>
</li>
-</ul>
-<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>
-<h3>Named remote in configuration file</h3>
-<p>You can choose to provide the name of a remote which you had previously
+</ul></div>
+<div class="para"><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="para"><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
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>
+config file would appear like this:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt> [remote "<name>"]
@@ -831,13 +879,13 @@ config file would appear like this:</p> push = <refspec>
fetch = <refspec></tt></pre>
</div></div>
-<h3>Named file in <tt>$GIT_DIR/remotes</tt></h3>
-<p>You can choose to provide the name of a
+<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="para"><p>You can choose to provide the name of a
file in <tt>$GIT_DIR/remotes</tt>. 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>
+following format:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt> URL: one of the above URL format
@@ -845,32 +893,32 @@ following format:</p> Pull: <refspec>
</tt></pre>
</div></div>
-<p><tt>Push:</tt> lines are used by <tt>git-push</tt> and
-<tt>Pull:</tt> lines are used by <tt>git-pull</tt> and <tt>git-fetch</tt>.
+<div class="para"><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
-be specified for additional branch mappings.</p>
-<h3>Named file in <tt>$GIT_DIR/branches</tt></h3>
-<p>You can choose to provide the name of a
+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 class="para"><p>You can choose to provide the name of a
file in <tt>$GIT_DIR/branches</tt>.
The URL in this file will be used to access the repository.
-This file should have the following format:</p>
+This file should have the following format:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt> <url>#<head></tt></pre>
</div></div>
-<p><tt><url></tt> is required; <tt>#<head></tt> is optional.
+<div class="para"><p><tt><url></tt> is required; <tt>#<head></tt> is optional.
When you do not provide a refspec on the command line,
git will use the following refspec, where <tt><head></tt> defaults to <tt>master</tt>,
and <tt><repository></tt> is the name of this file
-you provided in the command line.</p>
+you provided in the command line.</p></div>
<div class="listingblock">
<div class="content">
<pre><tt> refs/heads/<head>:<repository></tt></pre>
</div></div>
</div>
-<h2>MERGE STRATEGIES</h2>
+<h2 id="_merge_strategies">MERGE STRATEGIES</h2>
<div class="sectionbody">
-<dl>
+<div class="vlist"><dl>
<dt>
resolve
</dt>
@@ -936,46 +984,46 @@ subtree ancestor tree.
</p>
</dd>
-</dl>
+</dl></div>
</div>
-<h2>DEFAULT BEHAVIOUR</h2>
+<h2 id="_default_behaviour">DEFAULT BEHAVIOUR</h2>
<div class="sectionbody">
-<p>Often people use <tt>git pull</tt> without giving any parameter.
+<div class="para"><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>
-<p>In order to determine what URL to use to fetch from, the value
+<tt>origin</tt>.</p></div>
+<div class="para"><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: </tt> line
-in <tt>$GIT_DIR/remotes/<origin></tt> file is used.</p>
-<p>In order to determine what remote branches to fetch (and
+in <tt>$GIT_DIR/remotes/<origin></tt> file is used.</p></div>
+<div class="para"><p>In order to determine what remote branches to fetch (and
optionally store in the 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>
file is consulted and its <tt>Pull: </tt> 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>
+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>
</div></div>
-<p>A globbing refspec must have a non-empty RHS (i.e. must store
+<div class="para"><p>A globbing refspec must have a non-empty RHS (i.e. must store
what were fetched in tracking branches), and its LHS and RHS
must end with <tt>/*</tt>. The above specifies that all remote
branches are tracked using tracking branches in
-<tt>refs/remotes/origin/</tt> hierarchy under the same name.</p>
-<p>The rule to determine which remote branch to merge after
+<tt>refs/remotes/origin/</tt> hierarchy under the same name.</p></div>
+<div class="para"><p>The rule to determine which remote branch to merge after
fetching is a bit involved, in order not to break backward
-compatibility.</p>
-<p>If explicit refspecs were given on the command
-line of <tt>git pull</tt>, they are all merged.</p>
-<p>When no refspec was given on the command line, then <tt>git pull</tt>
+compatibility.</p></div>
+<div class="para"><p>If explicit refspecs were given on the command
+line of <tt>git pull</tt>, they are all merged.</p></div>
+<div class="para"><p>When no refspec was given on the command line, then <tt>git pull</tt>
uses the refspec from the configuration or
<tt>$GIT_DIR/remotes/<origin></tt>. In such cases, the following
-rules apply:</p>
-<ol>
+rules apply:</p></div>
+<div class="olist"><ol>
<li>
<p>
If <tt>branch.<name>.merge</tt> configuration for the current
@@ -993,11 +1041,11 @@ If the refspec is a globbing one, nothing is merged. Otherwise the remote branch of the first refspec is merged.
</p>
</li>
-</ol>
+</ol></div>
</div>
-<h2>EXAMPLES</h2>
+<h2 id="_examples">EXAMPLES</h2>
<div class="sectionbody">
-<ul>
+<div class="ilist"><ul>
<li>
<p>
Update the remote-tracking branches for the repository
@@ -1008,9 +1056,9 @@ Update the remote-tracking branches for the repository <div class="content">
<pre><tt>$ git pull, git pull origin</tt></pre>
</div></div>
-<p>Normally the branch merged in is the HEAD of the remote repository,
+<div class="para"><p>Normally the branch merged in is the HEAD of the remote repository,
but the choice is determined by the branch.<name>.remote and
-branch.<name>.merge options; see <a href="git-config.html">git-config(1)</a> for details.</p>
+branch.<name>.merge options; see <a href="git-config.html">git-config(1)</a> for details.</p></div>
</li>
<li>
<p>
@@ -1020,8 +1068,8 @@ Merge into the current branch the remote branch <tt>next</tt>: <div class="content">
<pre><tt>$ git pull origin next</tt></pre>
</div></div>
-<p>This leaves a copy of <tt>next</tt> temporarily in FETCH_HEAD, but
-does not update any remote-tracking branches.</p>
+<div class="para"><p>This leaves a copy of <tt>next</tt> temporarily in FETCH_HEAD, but
+does not update any remote-tracking branches.</p></div>
</li>
<li>
<p>
@@ -1032,7 +1080,7 @@ Bundle local branch <tt>fixes</tt> and <tt>enhancements</tt> on top of <div class="content">
<pre><tt>$ git pull . fixes enhancements</tt></pre>
</div></div>
-<p>This <tt>git pull .</tt> syntax is equivalent to <tt>git merge</tt>.</p>
+<div class="para"><p>This <tt>git pull .</tt> syntax is equivalent to <tt>git merge</tt>.</p></div>
</li>
<li>
<p>
@@ -1053,11 +1101,11 @@ Merge local branch <tt>maint</tt> into the current branch, but do not make <div class="content">
<pre><tt>$ git pull --no-commit . maint</tt></pre>
</div></div>
-<p>This can be used when you want to include further changes to the
-merge, or want to write your own merge commit message.</p>
-<p>You should refrain from abusing this option to sneak substantial
+<div class="para"><p>This can be used when you want to include further changes to the
+merge, or want to write your own merge commit message.</p></div>
+<div class="para"><p>You should refrain from abusing this option to sneak substantial
changes into a merge commit. Small fixups like bumping
-release/version name would be acceptable.</p>
+release/version name would be acceptable.</p></div>
</li>
<li>
<p>
@@ -1069,39 +1117,39 @@ Command line pull of multiple branches from one repository: $ git fetch origin +pu:pu maint:tmp
$ git pull . tmp</tt></pre>
</div></div>
-<p>This updates (or creates, as necessary) branches <tt>pu</tt> and <tt>tmp</tt> in
+<div class="para"><p>This updates (or creates, as necessary) branches <tt>pu</tt> and <tt>tmp</tt> in
the local repository by fetching from the branches (respectively)
-<tt>pu</tt> and <tt>maint</tt> from the remote repository.</p>
-<p>The <tt>pu</tt> branch will be updated even if it is does not fast-forward;
-the others will not be.</p>
-<p>The final command then merges the newly fetched <tt>tmp</tt> into master.</p>
+<tt>pu</tt> and <tt>maint</tt> from the remote repository.</p></div>
+<div class="para"><p>The <tt>pu</tt> branch will be updated even if it is does not fast-forward;
+the others will not be.</p></div>
+<div class="para"><p>The final command then merges the newly fetched <tt>tmp</tt> into master.</p></div>
</li>
-</ul>
-<p>If you tried a pull which resulted in a complex conflicts and
-would want to start over, you can recover with <tt>git-reset</tt>.</p>
+</ul></div>
+<div class="para"><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>
-<h2>SEE ALSO</h2>
+<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
-<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 class="para"><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>
-<h2>Author</h2>
+<h2 id="_author">Author</h2>
<div class="sectionbody">
-<p>Written by Linus Torvalds <torvalds@osdl.org>
-and Junio C Hamano <junkio@cox.net></p>
+<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org>
+and Junio C Hamano <junkio@cox.net></p></div>
</div>
-<h2>Documentation</h2>
+<h2 id="_documentation">Documentation</h2>
<div class="sectionbody">
-<p>Documentation by Jon Loeliger,
+<div class="para"><p>Documentation by Jon Loeliger,
David Greaves,
-Junio C Hamano and the git-list <git@vger.kernel.org>.</p>
+Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div>
</div>
-<h2>GIT</h2>
+<h2 id="_git">GIT</h2>
<div class="sectionbody">
-<p>Part of the <a href="git.html">git(1)</a> suite</p>
+<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 02-Jul-2008 03:01:56 UTC
+Last updated 2008-07-06 05:16:56 UTC
</div>
</div>
</body>
|