diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-10-21 15:14:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-21 15:14:45 -0700 |
| commit | e478e40b3bf294a7583ba51d60eedaa3083c4731 (patch) | |
| tree | ddeb2f3367cd4f38502ad03c95d6decb155523be /git-merge.html | |
| parent | 4c43d654605b5ec2d0624221acdda71114398253 (diff) | |
| download | git-htmldocs-e478e40b3bf294a7583ba51d60eedaa3083c4731.tar.gz | |
Autogenerated HTML docs for v2.1.2-532-g19b5d
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 204 |
1 files changed, 101 insertions, 103 deletions
diff --git a/git-merge.html b/git-merge.html index c0ced88d2..1dd2f0959 100644 --- a/git-merge.html +++ b/git-merge.html @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.6" />
+<meta name="generator" content="AsciiDoc 8.6.9" />
<title>git-merge(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -87,10 +87,16 @@ ul, ol, li > p { ul > li { color: #aaa; }
ul > li > * { color: black; }
-pre {
+.monospaced, code, pre {
+ font-family: "Courier New", Courier, monospace;
+ font-size: inherit;
+ color: navy;
padding: 0;
margin: 0;
}
+pre {
+ white-space: pre-wrap;
+}
#author {
color: #527bbd;
@@ -219,7 +225,7 @@ div.exampleblock > div.content { }
div.imageblock div.content { padding-left: 0; }
-span.image img { border-style: none; }
+span.image img { border-style: none; vertical-align: text-bottom; }
a.image:visited { color: white; }
dl {
@@ -349,7 +355,7 @@ div.colist td img { margin-bottom: 0.1em;
}
-div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
+div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
margin-top: 0;
margin-bottom: 0;
}
@@ -407,18 +413,14 @@ span.underline { text-decoration: underline; } span.overline { text-decoration: overline; }
span.line-through { text-decoration: line-through; }
+div.unbreakable { page-break-inside: avoid; }
+
/*
* xhtml11 specific
*
* */
-tt {
- font-family: monospace;
- font-size: inherit;
- color: navy;
-}
-
div.tableblock {
margin-top: 1.0em;
margin-bottom: 1.5em;
@@ -452,12 +454,6 @@ div.tableblock > table[frame="vsides"] { *
* */
-.monospaced {
- font-family: monospace;
- font-size: inherit;
- color: navy;
-}
-
table.tableblock {
margin-top: 1.0em;
margin-bottom: 1.5em;
@@ -537,6 +533,8 @@ body.manpage div.sectionbody { @media print {
body.manpage div#toc { display: none; }
}
+
+
</style>
<script type="text/javascript">
/*<+'])');
+ var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
// Function that scans the DOM tree for header elements (the DOM2
// nodeIterator API would be a better technique but not supported by all
// browsers).
@@ -610,7 +608,7 @@ toc: function (toclevels) { var i;
for (i = 0; i < toc.childNodes.length; i++) {
var entry = toc.childNodes[i];
- if (entry.nodeName == 'div'
+ if (entry.nodeName.toLowerCase() == 'div'
&& entry.getAttribute("class")
&& entry.getAttribute("class").match(/^toclevel/))
tocEntriesToRemove.push(entry);
@@ -656,7 +654,7 @@ footnotes: function () { var entriesToRemove = [];
for (i = 0; i < noteholder.childNodes.length; i++) {
var entry = noteholder.childNodes[i];
- if (entry.nodeName == 'div' && entry.getAttribute("class") == "footnote")
+ if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
entriesToRemove.push(entry);
}
for (i = 0; i < entriesToRemove.length; i++) {
@@ -768,28 +766,28 @@ 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="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 topic
+<pre><code> A---B---C topic
/
- D---E---F---G master</tt></pre>
+ D---E---F---G master</code></pre>
</div></div>
-<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
+<div class="paragraph"><p>Then "<code>git merge topic</code>" will replay the changes made on the
+<code>topic</code> branch since it diverged from <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 topic
+<pre><code> A---B---C topic
/ \
- D---E---F---G---H master</tt></pre>
+ D---E---F---G---H master</code></pre>
</div></div>
-<div class="paragraph"><p>The second syntax (<msg> <tt>HEAD</tt> <commit>…) is supported for
+<div class="paragraph"><p>The second syntax (<msg> <code>HEAD</code> <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="paragraph"><p>The third syntax ("<tt>git merge --abort</tt>") can only be run after the
+new scripts. It is the same as <code>git merge -m <msg> <commit>...</code>.</p></div>
+<div class="paragraph"><p>The third syntax ("<code>git merge --abort</code>") can only be run after the
merge has resulted in conflicts. <em>git merge --abort</em> will abort the
merge process and try to reconstruct the pre-merge state. However,
if there were uncommitted changes when the merge started (and
@@ -833,18 +831,18 @@ 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> (or <tt>-e</tt>) option is still useful if you are
-giving a draft message with the <tt>-m</tt> option from the command line
+The <code>--edit</code> (or <code>-e</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
@@ -872,7 +870,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>
@@ -918,8 +916,8 @@ merge.</p></div> <p>
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, move the <tt>HEAD</tt>, or record <tt>$GIT_DIR/MERGE_HEAD</tt>
- (to cause the next <tt>git commit</tt> command to create a merge
+ make a commit, move the <code>HEAD</code>, or 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).
@@ -937,7 +935,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>
@@ -1033,7 +1031,7 @@ 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="paragraph"><p>If <tt>--log</tt> is specified, a shortlog of the commits being merged
+<div class="paragraph"><p>If <code>--log</code> 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>
@@ -1061,7 +1059,7 @@ started, <em>git merge --abort</em> will in some cases be unable to reconstruct these changes. It is therefore recommended to always
commit or stash your changes before running <em>git merge</em>.</p></div>
<div class="paragraph"><p><em>git merge --abort</em> is equivalent to <em>git reset --merge</em> when
-<tt>MERGE_HEAD</tt> is present.</p></div>
+<code>MERGE_HEAD</code> is present.</p></div>
</dd>
<dt class="hdlist1">
<commit>…
@@ -1090,10 +1088,10 @@ local uncommitted changes overlap with files that <em>git pull</em>/<em>git merge</em> may need to update.</p></div>
<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
+registered in the index relative to the <code>HEAD</code> commit. (One
exception is when the changed index entries are in the state that
would result from the merge already.)</p></div>
-<div class="paragraph"><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 <code>HEAD</code>, <em>git merge</em>
will exit early with the message "Already up-to-date."</p></div>
</div>
</div>
@@ -1105,10 +1103,10 @@ 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
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
+combined history; instead, the <code>HEAD</code> (along with the index) is
updated to point at the named commit, without creating an extra
merge commit.</p></div>
-<div class="paragraph"><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 <code>--no-ff</code> option.</p></div>
</div>
</div>
<div class="sect1">
@@ -1118,7 +1116,7 @@ merge commit.</p></div> merged must be tied together by a merge commit that has both of them
as its parents.</p></div>
<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
+merged is committed, and your <code>HEAD</code>, 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="paragraph"><p>When it is not obvious how to reconcile the changes, the following
@@ -1126,12 +1124,12 @@ happens:</p></div> <div class="olist arabic"><ol class="arabic">
<li>
<p>
-The <tt>HEAD</tt> pointer stays the same.
+The <code>HEAD</code> pointer stays the same.
</p>
</li>
<li>
<p>
-The <tt>MERGE_HEAD</tt> ref is set to point to the other branch head.
+The <code>MERGE_HEAD</code> ref is set to point to the other branch head.
</p>
</li>
<li>
@@ -1144,10 +1142,10 @@ Paths that merged cleanly are updated both in the index file and <p>
For conflicting paths, the index file records up to three
versions: stage 1 stores the version from the common ancestor,
- stage 2 from <tt>HEAD</tt>, and stage 3 from <tt>MERGE_HEAD</tt> (you
- can inspect the stages with <tt>git ls-files -u</tt>). The working
+ stage 2 from <code>HEAD</code>, and stage 3 from <code>MERGE_HEAD</code> (you
+ can inspect the stages with <code>git ls-files -u</code>). The working
tree files contain the result of the "merge" program; i.e. 3-way
- merge results with familiar conflict markers <tt><<<</tt> <tt>===</tt> <tt>>>></tt>.
+ merge results with familiar conflict markers <code><<<</code> <code>===</code> <code>>>></code>.
</p>
</li>
<li>
@@ -1155,12 +1153,12 @@ For conflicting paths, the index file records up to three No other changes are made. In particular, the local
modifications you had before you started merge will stay the
same and the index entries for them stay as they were,
- i.e. matching <tt>HEAD</tt>.
+ i.e. matching <code>HEAD</code>.
</p>
</li>
</ol></div>
<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 merge --abort</tt>.</p></div>
+want to start over, you can recover with <code>git merge --abort</code>.</p></div>
</div>
</div>
<div class="sect1">
@@ -1175,13 +1173,13 @@ as a comment in the message template. See also <a href="git-tag.html">git-tag(1) that happens to be tagged, e.g. synchronizing with an upstream
release point, you may not want to make an unnecessary merge commit.</p></div>
<div class="paragraph"><p>In such a case, you can "unwrap" the tag yourself before feeding it
-to <tt>git merge</tt>, or pass <tt>--ff-only</tt> when you do not have any work on
+to <code>git merge</code>, or pass <code>--ff-only</code> when you do not have any work on
your own. e.g.</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>git fetch origin
+<pre><code>git fetch origin
git merge v1.2.3^0
-git merge --ff-only v1.2.3</tt></pre>
+git merge --ff-only v1.2.3</code></pre>
</div></div>
</div>
</div>
@@ -1199,7 +1197,7 @@ resolve it by leaving what both sides did to that area.</p></div> from the RCS suite to present such a conflicted hunk, like this:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>Here are lines that are either unchanged from the common
+<pre><code>Here are lines that are either unchanged from the common
ancestor, or cleanly resolved because only one side changed.
<<<<<<< yours:sample.txt
Conflict resolution is hard;
@@ -1207,10 +1205,10 @@ let's go shopping. =======
Git makes conflict resolution easy.
>>>>>>> theirs:sample.txt
-And here is another line that is cleanly resolved or unmodified.</tt></pre>
+And here is another line that is cleanly resolved or unmodified.</code></pre>
</div></div>
<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>
+<code><<<<<<<</code>, <code>=======</code>, and <code>>>>>>>></code>. The part before the <code>=======</code>
is typically your side, and the part afterwards is typically their side.</p></div>
<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
@@ -1222,7 +1220,7 @@ configuration variable to "diff3". In "diff3" style, the above conflict may look like this:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>Here are lines that are either unchanged from the common
+<pre><code>Here are lines that are either unchanged from the common
ancestor, or cleanly resolved because only one side changed.
<<<<<<< yours:sample.txt
Conflict resolution is hard;
@@ -1232,10 +1230,10 @@ Conflict resolution is hard. =======
Git makes conflict resolution easy.
>>>>>>> theirs:sample.txt
-And here is another line that is cleanly resolved or unmodified.</tt></pre>
+And here is another line that is cleanly resolved or unmodified.</code></pre>
</div></div>
-<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
+<div class="paragraph"><p>In addition to the <code><<<<<<<</code>, <code>=======</code>, and <code>>>>>>>></code> markers, it uses
+another <code>|||||||</code> 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
positive attitude. You can sometimes come up with a better resolution by
@@ -1250,8 +1248,8 @@ viewing the original.</p></div> <li>
<p>
Decide not to merge. The only clean-ups you need are to reset
- the index file to the <tt>HEAD</tt> commit to reverse 2. and to clean
- up working tree changes made by 2. and 3.; <tt>git merge --abort</tt>
+ the index file to the <code>HEAD</code> commit to reverse 2. and to clean
+ up working tree changes made by 2. and 3.; <code>git merge --abort</code>
can be used for this.
</p>
</li>
@@ -1267,29 +1265,29 @@ Resolve the conflicts. Git will mark the conflicts in <div class="ulist"><ul>
<li>
<p>
-Use a mergetool. <tt>git mergetool</tt> to launch a graphical
+Use a mergetool. <code>git mergetool</code> to launch a graphical
mergetool which will work you through the merge.
</p>
</li>
<li>
<p>
-Look at the diffs. <tt>git diff</tt> will show a three-way diff,
- highlighting changes from both the <tt>HEAD</tt> and <tt>MERGE_HEAD</tt>
+Look at the diffs. <code>git diff</code> will show a three-way diff,
+ highlighting changes from both the <code>HEAD</code> and <code>MERGE_HEAD</code>
versions.
</p>
</li>
<li>
<p>
-Look at the diffs from each branch. <tt>git log --merge -p <path></tt>
- will show diffs first for the <tt>HEAD</tt> version and then the
- <tt>MERGE_HEAD</tt> version.
+Look at the diffs from each branch. <code>git log --merge -p <path></code>
+ will show diffs first for the <code>HEAD</code> version and then the
+ <code>MERGE_HEAD</code> version.
</p>
</li>
<li>
<p>
-Look at the originals. <tt>git show :1:filename</tt> shows the
- common ancestor, <tt>git show :2:filename</tt> shows the <tt>HEAD</tt>
- version, and <tt>git show :3:filename</tt> shows the <tt>MERGE_HEAD</tt>
+Look at the originals. <code>git show :1:filename</code> shows the
+ common ancestor, <code>git show :2:filename</code> shows the <code>HEAD</code>
+ version, and <code>git show :3:filename</code> shows the <code>MERGE_HEAD</code>
version.
</p>
</li>
@@ -1302,32 +1300,32 @@ Look at the originals. <tt>git show :1:filename</tt> shows the <div class="ulist"><ul>
<li>
<p>
-Merge branches <tt>fixes</tt> and <tt>enhancements</tt> on top of
+Merge branches <code>fixes</code> and <code>enhancements</code> on top of
the current branch, making an octopus merge:
</p>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git merge fixes enhancements</tt></pre>
+<pre><code>$ git merge fixes enhancements</code></pre>
</div></div>
</li>
<li>
<p>
-Merge branch <tt>obsolete</tt> into the current branch, using <tt>ours</tt>
+Merge branch <code>obsolete</code> into the current branch, using <code>ours</code>
merge strategy:
</p>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git merge -s ours obsolete</tt></pre>
+<pre><code>$ git merge -s ours obsolete</code></pre>
</div></div>
</li>
<li>
<p>
-Merge branch <tt>maint</tt> into the current branch, but do not make
+Merge branch <code>maint</code> into the current branch, but do not make
a new commit automatically:
</p>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git merge --no-commit maint</tt></pre>
+<pre><code>$ git merge --no-commit maint</code></pre>
</div></div>
<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>
@@ -1341,10 +1339,10 @@ release/version name would be acceptable.</p></div> <div class="sect1">
<h2 id="_merge_strategies">MERGE STRATEGIES</h2>
<div class="sectionbody">
-<div class="paragraph"><p>The merge mechanism (<tt>git merge</tt> and <tt>git pull</tt> 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 <tt>git merge</tt> and/or <tt>git pull</tt>.</p></div>
+<div class="paragraph"><p>The merge mechanism (<code>git merge</code> and <code>git pull</code> commands) allows the
+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 <code>git merge</code> and/or <code>git pull</code>.</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
resolve
@@ -1408,7 +1406,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">
@@ -1419,7 +1417,7 @@ diff-algorithm=[patience|minimal|histogram|myers] Tells <em>merge-recursive</em> to use a different diff algorithm, which
can help avoid mismerges that occur due to unimportant matching
lines (such as braces from distinct functions). See also
- <a href="git-diff.html">git-diff(1)</a> <tt>--diff-algorithm</tt>.
+ <a href="git-diff.html">git-diff(1)</a> <code>--diff-algorithm</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -1436,8 +1434,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>
@@ -1477,8 +1475,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">
@@ -1487,7 +1485,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">
@@ -1562,10 +1560,10 @@ merge.conflictstyle <p>
Specify the style in which conflicted hunks are written out to
working tree files upon merge. The default is "merge", which
- shows a <tt><<<<<<<</tt> conflict marker, changes made by one side,
- a <tt>=======</tt> marker, changes made by the other side, and then
- a <tt>>>>>>>></tt> marker. An alternate style, "diff3", adds a <tt>|||||||</tt>
- marker and the original text before the <tt>=======</tt> marker.
+ shows a <code><<<<<<<</code> conflict marker, changes made by one side,
+ a <code>=======</code> marker, changes made by the other side, and then
+ a <code>>>>>>>></code> marker. An alternate style, "diff3", adds a <code>|||||||</code>
+ marker and the original text before the <code>=======</code> marker.
</p>
</dd>
<dt class="hdlist1">
@@ -1576,9 +1574,9 @@ merge.defaultToUpstream If merge is called without any commit argument, merge the upstream
branches configured for the current branch by using their last
observed values stored in their remote-tracking branches.
- The values of the <tt>branch.<current branch>.merge</tt> that name the
- branches at the remote named by <tt>branch.<current branch>.remote</tt>
- are consulted, and then they are mapped via <tt>remote.<remote>.fetch</tt>
+ The values of the <code>branch.<current branch>.merge</code> that name the
+ branches at the remote named by <code>branch.<current branch>.remote</code>
+ are consulted, and then they are mapped via <code>remote.<remote>.fetch</code>
to their corresponding remote-tracking branches, and the tips of
these tracking branches are merged.
</p>
@@ -1590,11 +1588,11 @@ merge.ff <p>
By default, Git does not create an extra merge commit when merging
a commit that is a descendant of the current commit. Instead, the
- tip of the current branch is fast-forwarded. When set to <tt>false</tt>,
+ tip of the current branch is fast-forwarded. When set to <code>false</code>,
this variable tells Git to create an extra merge commit in such
- a case (equivalent to giving the <tt>--no-ff</tt> option from the command
- line). When set to <tt>only</tt>, only such fast-forward merges are
- allowed (equivalent to giving the <tt>--ff-only</tt> option from the
+ a case (equivalent to giving the <code>--no-ff</code> option from the command
+ line). When set to <code>only</code>, only such fast-forward merges are
+ allowed (equivalent to giving the <code>--ff-only</code> option from the
command line).
</p>
</dd>
|