diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-11-06 01:01:59 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-11-06 01:01:59 +0000 |
| commit | 68cf15a825368c926443c26a6516947fca3c1d39 (patch) | |
| tree | a587c9a51372746ddc3cdb08108bb14fb94a0488 /git-merge.html | |
| parent | 39c7a69d994a13cbd5594bf2f5e65a0f21cc9bb9 (diff) | |
| download | git-htmldocs-68cf15a825368c926443c26a6516947fca3c1d39.tar.gz | |
Autogenerated HTML docs for v1.7.3.2-161-g3089c
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 376 |
1 files changed, 233 insertions, 143 deletions
diff --git a/git-merge.html b/git-merge.html index 20790b54a..26452243d 100644 --- a/git-merge.html +++ b/git-merge.html @@ -3,7 +3,8 @@ <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.2.5" />
+<meta name="generator" content="AsciiDoc 8.4.5" />
+<title>git-merge(1)</title>
<style type="text/css">
/* Debug borders */
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -26,10 +27,12 @@ a:visited { em {
font-style: italic;
+ color: navy;
}
strong {
font-weight: bold;
+ color: #083194;
}
tt {
@@ -71,6 +74,10 @@ p { margin-bottom: 0.5em;
}
+ul, ol, li > p {
+ margin-top: 0;
+}
+
pre {
padding: 0;
margin: 0;
@@ -84,7 +91,7 @@ span#author { }
span#email {
}
-span#revision {
+span#revnumber, span#revdate, span#revremark {
font-family: sans-serif;
}
@@ -104,11 +111,13 @@ div#footer-badges { padding-bottom: 0.5em;
}
-div#preamble,
+div#preamble {
+ margin-top: 1.5em;
+ margin-bottom: 1.5em;
+}
div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
div.admonitionblock {
- margin-right: 10%;
margin-top: 1.5em;
margin-bottom: 1.5em;
}
@@ -123,6 +132,7 @@ div.content { /* Block element content. */ /* Block element titles. */
div.title, caption.title {
+ color: #527bbd;
font-family: sans-serif;
font-weight: bold;
text-align: left;
@@ -149,22 +159,33 @@ div.sidebarblock > div.content { padding: 0.5em;
}
-div.listingblock {
- margin-right: 0%;
-}
div.listingblock > div.content {
border: 1px solid silver;
background: #f4f4f4;
padding: 0.5em;
}
-div.quoteblock > div.content {
+div.quoteblock {
padding-left: 2.0em;
+ margin-right: 10%;
}
-
-div.attribution {
+div.quoteblock > div.attribution {
+ padding-top: 0.5em;
text-align: right;
}
+
+div.verseblock {
+ padding-left: 2.0em;
+ margin-right: 10%;
+}
+div.verseblock > div.content {
+ white-space: pre;
+}
+div.verseblock > div.attribution {
+ padding-top: 0.75em;
+ text-align: left;
+}
+/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
div.verseblock + div.attribution {
text-align: left;
}
@@ -187,13 +208,9 @@ div.exampleblock > div.content { padding: 0.5em;
}
-div.verseblock div.content {
- white-space: pre;
-}
-
div.imageblock div.content { padding-left: 0; }
-div.imageblock img { border: 1px solid silver; }
span.image img { border-style: none; }
+a.image:visited { color: white; }
dl {
margin-top: 0.8em;
@@ -202,18 +219,38 @@ dl { dt {
margin-top: 0.5em;
margin-bottom: 0;
- font-style: italic;
+ font-style: normal;
+ color: navy;
}
dd > *:first-child {
- margin-top: 0;
+ margin-top: 0.1em;
}
ul, ol {
list-style-position: outside;
}
-div.olist2 ol {
+ol.arabic {
+ list-style-type: decimal;
+}
+ol.loweralpha {
list-style-type: lower-alpha;
}
+ol.upperalpha {
+ list-style-type: upper-alpha;
+}
+ol.lowerroman {
+ list-style-type: lower-roman;
+}
+ol.upperroman {
+ list-style-type: upper-roman;
+}
+
+div.compact ul, div.compact ol,
+div.compact p, div.compact p,
+div.compact div, div.compact div {
+ margin-top: 0.1em;
+ margin-bottom: 0.1em;
+}
div.tableblock > table {
border: 3px solid #527bbd;
@@ -225,22 +262,53 @@ thead { 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.hlist {
+div.hdlist {
margin-top: 0.8em;
margin-bottom: 0.8em;
}
-div.hlist td {
- padding-bottom: 5px;
+div.hdlist tr {
+ padding-bottom: 15px;
+}
+dt.hdlist1.strong, td.hdlist1.strong {
+ font-weight: bold;
}
-td.hlist1 {
+td.hdlist1 {
vertical-align: top;
- font-style: italic;
+ font-style: normal;
padding-right: 0.8em;
+ color: navy;
}
-td.hlist2 {
+td.hdlist2 {
vertical-align: top;
}
+div.hdlist.compact tr {
+ margin: 0;
+ padding-bottom: 0;
+}
+
+.comment {
+ background: yellow;
+}
@media print {
div#footer-badges { display: none; }
@@ -271,7 +339,24 @@ div.toclevel4 { margin-left: 6em;
font-size: 0.9em;
}
-include1::./stylesheets/xhtml11-manpage.css[]
+/* Overrides for manpage documents */
+h1 {
+ padding-top: 0.5em;
+ padding-bottom: 0.5em;
+ border-top: 2px solid silver;
+ border-bottom: 2px solid silver;
+}
+h2 {
+ border-style: none;
+}
+div.sectionbody {
+ margin-left: 5%;
+}
+
+@media print {
+ div#toc { display: none; }
+}
+
/* Workarounds for IE6's broken and incomplete CSS2. */
div.sidebar-content {
@@ -280,6 +365,7 @@ div.sidebar-content { padding: 0.5em;
}
div.sidebar-title, div.image-title {
+ color: #527bbd;
font-family: sans-serif;
font-weight: bold;
margin-top: 0.0em;
@@ -292,8 +378,17 @@ div.listingblock div.content { padding: 0.5em;
}
-div.quoteblock-content {
- padding-left: 2.0em;
+div.quoteblock-attribution {
+ padding-top: 0.5em;
+ text-align: right;
+}
+
+div.verseblock-content {
+ white-space: pre;
+}
+div.verseblock-attribution {
+ padding-top: 0.75em;
+ text-align: left;
}
div.exampleblock-content {
@@ -304,7 +399,6 @@ div.exampleblock-content { /* IE6 sets dynamically generated links as visited. */
div#toc a:visited { color: blue; }
</style>
-<title>git-merge(1)</title>
</head>
<body>
<div id="header">
@@ -318,22 +412,24 @@ git-merge(1) Manual Page </p>
</div>
</div>
-<h2>SYNOPSIS</h2>
+<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="content"><em>git merge</em> [-n] [--stat] [--no-commit] [--squash]
+<div class="verseblock-content"><em>git merge</em> [-n] [--stat] [--no-commit] [--squash]
[-s <strategy>] [-X <strategy-option>]
[--[no-]rerere-autoupdate] [-m <msg>] <commit>…
-<em>git merge</em> <msg> HEAD <commit>…</div></div>
+<em>git merge</em> <msg> HEAD <commit>…</div>
+<div class="verseblock-attribution">
+</div></div>
</div>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="para"><p>Incorporates changes from the named commits (since the time their
+<div class="paragraph"><p>Incorporates changes from the named commits (since the time their
histories diverged from the current branch) into the current
branch. This command is used by <em>git pull</em> to incorporate changes
from another repository and can be used by hand to merge changes
from one branch into another.</p></div>
-<div class="para"><p>Assume the following history exists and the current branch is
+<div class="paragraph"><p>Assume the following history exists and the current branch is
"<tt>master</tt>":</p></div>
<div class="listingblock">
<div class="content">
@@ -341,7 +437,7 @@ from one branch into another.</p></div> /
D---E---F---G master</tt></pre>
</div></div>
-<div class="para"><p>Then "<tt>git merge topic</tt>" will replay the changes made on the
+<div class="paragraph"><p>Then "<tt>git merge topic</tt>" will replay the changes made on the
<tt>topic</tt> branch since it diverged from <tt>master</tt> (i.e., <tt>E</tt>) until
its current commit (<tt>C</tt>) on top of <tt>master</tt>, and record the result
in a new commit along with the names of the two parent commits and
@@ -352,20 +448,20 @@ a log message from the user describing the changes.</p></div> / \
D---E---F---G---H master</tt></pre>
</div></div>
-<div class="para"><p>The second syntax (<msg> <tt>HEAD</tt> <commit>…) is supported for
+<div class="paragraph"><p>The second syntax (<msg> <tt>HEAD</tt> <commit>…) is supported for
historical reasons. Do not use it from the command line or in
new scripts. It is the same as <tt>git merge -m <msg> <commit>…</tt>.</p></div>
-<div class="para"><p><strong>Warning</strong>: Running <em>git merge</em> with uncommitted changes is
+<div class="paragraph"><p><strong>Warning</strong>: Running <em>git merge</em> with uncommitted changes is
discouraged: while possible, it leaves you in a state that is hard to
back out of in the case of a conflict.</p></div>
</div>
<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
-<div class="vlist"><dl>
-<dt>
+<div class="dlist"><dl>
+<dt class="hdlist1">
--commit
</dt>
-<dt>
+<dt class="hdlist1">
--no-commit
</dt>
<dd>
@@ -373,14 +469,14 @@ back out of in the case of a conflict.</p></div> Perform the merge and commit the result. This option can
be used to override --no-commit.
</p>
-<div class="para"><p>With --no-commit perform the merge but pretend the merge
+<div class="paragraph"><p>With --no-commit perform the merge but pretend the merge
failed and do not autocommit, to give the user a chance to
inspect and further tweak the merge result before committing.</p></div>
</dd>
-<dt>
+<dt class="hdlist1">
--ff
</dt>
-<dt>
+<dt class="hdlist1">
--no-ff
</dt>
<dd>
@@ -389,13 +485,13 @@ inspect and further tweak the merge result before committing.</p></div> a fast-forward, only update the branch pointer. This is
the default behavior of git-merge.
</p>
-<div class="para"><p>With --no-ff Generate a merge commit even if the merge
+<div class="paragraph"><p>With --no-ff Generate a merge commit even if the merge
resolved as a fast-forward.</p></div>
</dd>
-<dt>
+<dt class="hdlist1">
--log[=<n>]
</dt>
-<dt>
+<dt class="hdlist1">
--no-log
</dt>
<dd>
@@ -404,16 +500,16 @@ resolved as a fast-forward.</p></div> one-line descriptions from at most <n> actual commits that are being
merged. See also <a href="git-fmt-merge-msg.html">git-fmt-merge-msg(1)</a>.
</p>
-<div class="para"><p>With --no-log do not list one-line descriptions from the
+<div class="paragraph"><p>With --no-log do not list one-line descriptions from the
actual commits being merged.</p></div>
</dd>
-<dt>
+<dt class="hdlist1">
--stat
</dt>
-<dt>
+<dt class="hdlist1">
-n
</dt>
-<dt>
+<dt class="hdlist1">
--no-stat
</dt>
<dd>
@@ -421,13 +517,13 @@ actual commits being merged.</p></div> Show a diffstat at the end of the merge. The diffstat is also
controlled by the configuration option merge.stat.
</p>
-<div class="para"><p>With -n or --no-stat do not show a diffstat at the end of the
+<div class="paragraph"><p>With -n or --no-stat do not show a diffstat at the end of the
merge.</p></div>
</dd>
-<dt>
+<dt class="hdlist1">
--squash
</dt>
-<dt>
+<dt class="hdlist1">
--no-squash
</dt>
<dd>
@@ -441,10 +537,10 @@ merge.</p></div> top of the current branch whose effect is the same as
merging another branch (or more in case of an octopus).
</p>
-<div class="para"><p>With --no-squash perform the merge and commit the result. This
+<div class="paragraph"><p>With --no-squash perform the merge and commit the result. This
option can be used to override --squash.</p></div>
</dd>
-<dt>
+<dt class="hdlist1">
--ff-only
</dt>
<dd>
@@ -454,10 +550,10 @@ option can be used to override --squash.</p></div> resolved as a fast-forward.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-s <strategy>
</dt>
-<dt>
+<dt class="hdlist1">
--strategy=<strategy>
</dt>
<dd>
@@ -469,10 +565,10 @@ option can be used to override --squash.</p></div> head, <em>git merge-octopus</em> otherwise).
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-X <option>
</dt>
-<dt>
+<dt class="hdlist1">
--strategy-option=<option>
</dt>
<dd>
@@ -481,10 +577,10 @@ option can be used to override --squash.</p></div> strategy.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--summary
</dt>
-<dt>
+<dt class="hdlist1">
--no-summary
</dt>
<dd>
@@ -493,10 +589,10 @@ option can be used to override --squash.</p></div> removed in the future.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-q
</dt>
-<dt>
+<dt class="hdlist1">
--quiet
</dt>
<dd>
@@ -504,10 +600,10 @@ option can be used to override --squash.</p></div> Operate quietly.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-v
</dt>
-<dt>
+<dt class="hdlist1">
--verbose
</dt>
<dd>
@@ -515,7 +611,7 @@ option can be used to override --squash.</p></div> Be verbose.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-m <msg>
</dt>
<dd>
@@ -523,22 +619,16 @@ option can be used to override --squash.</p></div> Set the commit message to be used for the merge commit (in
case one is created).
</p>
-<div class="literalblock">
-<div class="content">
-<pre><tt>If `--log` is specified, a shortlog of the commits being merged
-will be appended to the specified message.</tt></pre>
-</div></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>The 'git fmt-merge-msg' command can be
-used to give a good default for automated 'git merge'
-invocations.</tt></pre>
-</div></div>
+<div class="paragraph"><p>If <tt>--log</tt> is specified, a shortlog of the commits being merged
+will be appended to the specified message.</p></div>
+<div class="paragraph"><p>The <em>git fmt-merge-msg</em> command can be
+used to give a good default for automated <em>git merge</em>
+invocations.</p></div>
</dd>
-<dt>
+<dt class="hdlist1">
--rerere-autoupdate
</dt>
-<dt>
+<dt class="hdlist1">
--no-rerere-autoupdate
</dt>
<dd>
@@ -547,7 +637,7 @@ invocations.</tt></pre> result of auto-conflict resolution if possible.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
<commit>…
</dt>
<dd>
@@ -561,23 +651,23 @@ invocations.</tt></pre> </div>
<h2 id="_pre_merge_checks">PRE-MERGE CHECKS</h2>
<div class="sectionbody">
-<div class="para"><p>Before applying outside changes, you should get your own work in
+<div class="paragraph"><p>Before applying outside changes, you should get your own work in
good shape and committed locally, so it will not be clobbered if
there are conflicts. See also <a href="git-stash.html">git-stash(1)</a>.
<em>git pull</em> and <em>git merge</em> will stop without doing anything when
local uncommitted changes overlap with files that <em>git pull</em>/<em>git
merge</em> may need to update.</p></div>
-<div class="para"><p>To avoid recording unrelated changes in the merge commit,
+<div class="paragraph"><p>To avoid recording unrelated changes in the merge commit,
<em>git pull</em> and <em>git merge</em> will also abort if there are any changes
registered in the index relative to the <tt>HEAD</tt> commit. (One
exception is when the changed index entries are in the state that
would result from the merge already.)</p></div>
-<div class="para"><p>If all named commits are already ancestors of <tt>HEAD</tt>, <em>git merge</em>
+<div class="paragraph"><p>If all named commits are already ancestors of <tt>HEAD</tt>, <em>git merge</em>
will exit early with the message "Already up-to-date."</p></div>
</div>
<h2 id="_fast_forward_merge">FAST-FORWARD MERGE</h2>
<div class="sectionbody">
-<div class="para"><p>Often the current branch head is an ancestor of the named commit.
+<div class="paragraph"><p>Often the current branch head is an ancestor of the named commit.
This is the most common case especially when invoked from <em>git
pull</em>: you are tracking an upstream repository, you have committed
no local changes, and now you want to update to a newer upstream
@@ -585,20 +675,20 @@ revision. In this case, a new commit is not needed to store the combined history; instead, the <tt>HEAD</tt> (along with the index) is
updated to point at the named commit, without creating an extra
merge commit.</p></div>
-<div class="para"><p>This behavior can be suppressed with the <tt>--no-ff</tt> option.</p></div>
+<div class="paragraph"><p>This behavior can be suppressed with the <tt>--no-ff</tt> option.</p></div>
</div>
<h2 id="_true_merge">TRUE MERGE</h2>
<div class="sectionbody">
-<div class="para"><p>Except in a fast-forward merge (see above), the branches to be
+<div class="paragraph"><p>Except in a fast-forward merge (see above), the branches to be
merged must be tied together by a merge commit that has both of them
as its parents.</p></div>
-<div class="para"><p>A merged version reconciling the changes from all branches to be
+<div class="paragraph"><p>A merged version reconciling the changes from all branches to be
merged is committed, and your <tt>HEAD</tt>, index, and working tree are
updated to it. It is possible to have modifications in the working
tree as long as they do not overlap; the update will preserve them.</p></div>
-<div class="para"><p>When it is not obvious how to reconcile the changes, the following
+<div class="paragraph"><p>When it is not obvious how to reconcile the changes, the following
happens:</p></div>
-<div class="olist"><ol>
+<div class="olist arabic"><ol class="arabic">
<li>
<p>
The <tt>HEAD</tt> pointer stays the same.
@@ -634,19 +724,19 @@ No other changes are made. In particular, the local </p>
</li>
</ol></div>
-<div class="para"><p>If you tried a merge which resulted in complex conflicts and
+<div class="paragraph"><p>If you tried a merge which resulted in complex conflicts and
want to start over, you can recover with <tt>git reset --merge</tt>.</p></div>
</div>
<h2 id="_how_conflicts_are_presented">HOW CONFLICTS ARE PRESENTED</h2>
<div class="sectionbody">
-<div class="para"><p>During a merge, the working tree files are updated to reflect the result
-of the merge. Among the changes made to the common ancestor's version,
+<div class="paragraph"><p>During a merge, the working tree files are updated to reflect the result
+of the merge. Among the changes made to the common ancestor’s version,
non-overlapping ones (that is, you changed an area of the file while the
other side left that area intact, or vice versa) are incorporated in the
final result verbatim. When both sides made changes to the same area,
however, git cannot randomly pick one side over the other, and asks you to
resolve it by leaving what both sides did to that area.</p></div>
-<div class="para"><p>By default, git uses the same style as that is used by "merge" program
+<div class="paragraph"><p>By default, git uses the same style as that is used by "merge" program
from the RCS suite to present such a conflicted hunk, like this:</p></div>
<div class="listingblock">
<div class="content">
@@ -660,15 +750,15 @@ Git makes conflict resolution easy. >>>>>>> theirs:sample.txt
And here is another line that is cleanly resolved or unmodified.</tt></pre>
</div></div>
-<div class="para"><p>The area where a pair of conflicting changes happened is marked with markers
+<div class="paragraph"><p>The area where a pair of conflicting changes happened is marked with markers
<tt><<<<<<<</tt>, <tt>=======</tt>, and <tt>>>>>>>></tt>. The part before the <tt>=======</tt>
is typically your side, and the part afterwards is typically their side.</p></div>
-<div class="para"><p>The default format does not show what the original said in the conflicting
+<div class="paragraph"><p>The default format does not show what the original said in the conflicting
area. You cannot tell how many lines are deleted and replaced with
-Barbie's remark on your side. The only thing you can tell is that your
-side wants to say it is hard and you'd prefer to go shopping, while the
+Barbie’s remark on your side. The only thing you can tell is that your
+side wants to say it is hard and you’d prefer to go shopping, while the
other side wants to claim it is easy.</p></div>
-<div class="para"><p>An alternative style can be used by setting the "merge.conflictstyle"
+<div class="paragraph"><p>An alternative style can be used by setting the "merge.conflictstyle"
configuration variable to "diff3". In "diff3" style, the above conflict
may look like this:</p></div>
<div class="listingblock">
@@ -685,7 +775,7 @@ Git makes conflict resolution easy. >>>>>>> theirs:sample.txt
And here is another line that is cleanly resolved or unmodified.</tt></pre>
</div></div>
-<div class="para"><p>In addition to the <tt><<<<<<<</tt>, <tt>=======</tt>, and <tt>>>>>>>></tt> markers, it uses
+<div class="paragraph"><p>In addition to the <tt><<<<<<<</tt>, <tt>=======</tt>, and <tt>>>>>>>></tt> markers, it uses
another <tt>|||||||</tt> marker that is followed by the original text. You can
tell that the original just stated a fact, and your side simply gave in to
that statement and gave up, while the other side tried to have a more
@@ -694,8 +784,8 @@ viewing the original.</p></div> </div>
<h2 id="_how_to_resolve_conflicts">HOW TO RESOLVE CONFLICTS</h2>
<div class="sectionbody">
-<div class="para"><p>After seeing a conflict, you can do two things:</p></div>
-<div class="ilist"><ul>
+<div class="paragraph"><p>After seeing a conflict, you can do two things:</p></div>
+<div class="ulist"><ul>
<li>
<p>
Decide not to merge. The only clean-ups you need are to reset
@@ -712,8 +802,8 @@ Resolve the conflicts. Git will mark the conflicts in </p>
</li>
</ul></div>
-<div class="para"><p>You can work through the conflict with a number of tools:</p></div>
-<div class="ilist"><ul>
+<div class="paragraph"><p>You can work through the conflict with a number of tools:</p></div>
+<div class="ulist"><ul>
<li>
<p>
Use a mergetool. <tt>git mergetool</tt> to launch a graphical
@@ -746,7 +836,7 @@ Look at the originals. <tt>git show :1:filename</tt> shows the </div>
<h2 id="_examples">EXAMPLES</h2>
<div class="sectionbody">
-<div class="ilist"><ul>
+<div class="ulist"><ul>
<li>
<p>
Merge branches <tt>fixes</tt> and <tt>enhancements</tt> on top of
@@ -776,9 +866,9 @@ Merge branch <tt>maint</tt> into the current branch, but do not make <div class="content">
<pre><tt>$ git merge --no-commit maint</tt></pre>
</div></div>
-<div class="para"><p>This can be used when you want to include further changes to the
+<div class="paragraph"><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
+<div class="paragraph"><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></div>
</li>
@@ -786,12 +876,12 @@ release/version name would be acceptable.</p></div> </div>
<h2 id="_merge_strategies">MERGE STRATEGIES</h2>
<div class="sectionbody">
-<div class="para"><p>The merge mechanism (<em>git-merge</em> and <em>git-pull</em> commands) allows the
+<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>
arguments to <em>git-merge</em> and/or <em>git-pull</em>.</p></div>
-<div class="vlist"><dl>
-<dt>
+<div class="dlist"><dl>
+<dt class="hdlist1">
resolve
</dt>
<dd>
@@ -803,7 +893,7 @@ resolve fast.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
recursive
</dt>
<dd>
@@ -820,9 +910,9 @@ recursive renames. This is the default merge strategy when
pulling or merging one branch.
</p>
-<div class="para"><p>The <em>recursive</em> strategy can take the following options:</p></div>
-<div class="vlist"><dl>
-<dt>
+<div class="paragraph"><p>The <em>recursive</em> strategy can take the following options:</p></div>
+<div class="dlist"><dl>
+<dt class="hdlist1">
ours
</dt>
<dd>
@@ -831,11 +921,11 @@ ours favoring <em>our</em> version. Changes from the other tree that do not
conflict with our side are reflected to the merge result.
</p>
-<div class="para"><p>This should not be confused with the <em>ours</em> merge strategy, which does not
+<div class="paragraph"><p>This should not be confused with the <em>ours</em> merge strategy, which does not
even look at what the other tree contains at all. It discards everything
the other tree did, declaring <em>our</em> history contains all that happened in it.</p></div>
</dd>
-<dt>
+<dt class="hdlist1">
theirs
</dt>
<dd>
@@ -843,7 +933,7 @@ theirs This is opposite of <em>ours</em>.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
patience
</dt>
<dd>
@@ -855,13 +945,13 @@ patience See also <a href="git-diff.html">git-diff(1)</a> <tt>--patience</tt>.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
ignore-space-change
</dt>
-<dt>
+<dt class="hdlist1">
ignore-all-space
</dt>
-<dt>
+<dt class="hdlist1">
ignore-space-at-eol
</dt>
<dd>
@@ -872,7 +962,7 @@ ignore-space-at-eol See also <a href="git-diff.html">git-diff(1)</a> <tt>-b</tt>, <tt>-w</tt>, and
<tt>--ignore-space-at-eol</tt>.
</p>
-<div class="ilist"><ul>
+<div class="ulist"><ul>
<li>
<p>
If <em>their</em> version only introduces whitespace changes to a line,
@@ -892,7 +982,7 @@ Otherwise, the merge proceeds in the usual way. </li>
</ul></div>
</dd>
-<dt>
+<dt class="hdlist1">
renormalize
</dt>
<dd>
@@ -905,7 +995,7 @@ renormalize <a href="gitattributes.html">gitattributes(5)</a> for details.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
no-renormalize
</dt>
<dd>
@@ -914,7 +1004,7 @@ no-renormalize <tt>merge.renormalize</tt> configuration variable.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
rename-threshold=<n>
</dt>
<dd>
@@ -923,7 +1013,7 @@ rename-threshold=<n> See also <a href="git-diff.html">git-diff(1)</a> <tt>-M</tt>.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
subtree[=<path>]
</dt>
<dd>
@@ -937,7 +1027,7 @@ subtree[=<path>] </dd>
</dl></div>
</dd>
-<dt>
+<dt class="hdlist1">
octopus
</dt>
<dd>
@@ -949,7 +1039,7 @@ octopus pulling or merging more than one branch.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
ours
</dt>
<dd>
@@ -962,7 +1052,7 @@ ours the <em>recursive</em> merge strategy.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
subtree
</dt>
<dd>
@@ -978,8 +1068,8 @@ subtree </div>
<h2 id="_configuration">CONFIGURATION</h2>
<div class="sectionbody">
-<div class="vlist"><dl>
-<dt>
+<div class="dlist"><dl>
+<dt class="hdlist1">
merge.conflictstyle
</dt>
<dd>
@@ -992,7 +1082,7 @@ merge.conflictstyle marker and the original text before the <tt>=======</tt> marker.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
merge.log
</dt>
<dd>
@@ -1003,7 +1093,7 @@ merge.log true is a synoym for 20.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
merge.renameLimit
</dt>
<dd>
@@ -1013,7 +1103,7 @@ merge.renameLimit diff.renameLimit.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
merge.renormalize
</dt>
<dd>
@@ -1028,7 +1118,7 @@ merge.renormalize attributes" in <a href="gitattributes.html">gitattributes(5)</a>.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
merge.stat
</dt>
<dd>
@@ -1037,7 +1127,7 @@ merge.stat at the end of the merge. True by default.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
merge.tool
</dt>
<dd>
@@ -1050,7 +1140,7 @@ merge.tool and there must be a corresponding mergetool.<tool>.cmd option.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
merge.verbosity
</dt>
<dd>
@@ -1063,7 +1153,7 @@ merge.verbosity Can be overridden by the <em>GIT_MERGE_VERBOSITY</em> environment variable.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
merge.<driver>.name
</dt>
<dd>
@@ -1072,7 +1162,7 @@ merge.<driver>.name merge driver. See <a href="gitattributes.html">gitattributes(5)</a> for details.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
merge.<driver>.driver
</dt>
<dd>
@@ -1081,7 +1171,7 @@ merge.<driver>.driver merge driver. See <a href="gitattributes.html">gitattributes(5)</a> for details.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
merge.<driver>.recursive
</dt>
<dd>
@@ -1091,7 +1181,7 @@ merge.<driver>.recursive See <a href="gitattributes.html">gitattributes(5)</a> for details.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
branch.<name>.mergeoptions
</dt>
<dd>
@@ -1105,7 +1195,7 @@ branch.<name>.mergeoptions </div>
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
-<div class="para"><p><a href="git-fmt-merge-msg.html">git-fmt-merge-msg(1)</a>, <a href="git-pull.html">git-pull(1)</a>,
+<div class="paragraph"><p><a href="git-fmt-merge-msg.html">git-fmt-merge-msg(1)</a>, <a href="git-pull.html">git-pull(1)</a>,
<a href="gitattributes.html">gitattributes(5)</a>,
<a href="git-reset.html">git-reset(1)</a>,
<a href="git-diff.html">git-diff(1)</a>, <a href="git-ls-files.html">git-ls-files(1)</a>,
@@ -1114,19 +1204,19 @@ branch.<name>.mergeoptions </div>
<h2 id="_author">Author</h2>
<div class="sectionbody">
-<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div>
+<div class="paragraph"><p>Written by Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>></p></div>
</div>
<h2 id="_documentation">Documentation</h2>
<div class="sectionbody">
-<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div>
+<div class="paragraph"><p>Documentation by Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div>
</div>
<h2 id="_git">GIT</h2>
<div class="sectionbody">
-<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
+<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-10-27 06:08:20 UTC
+Last updated 2010-11-06 00:41:57 UTC
</div>
</div>
</body>
|