Autogenerated HTML docs for v1.7.11-rc2-2-g02101

1 files changed, 18 insertions, 19 deletions

diff --git a/git-merge.html b/git-merge.html
index 96d202672..bd37876cf 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -619,7 +619,7 @@ a log message from the user describing the changes.</p></div>
 </div></div>

 <div class="paragraph"><p>The second syntax (&lt;msg&gt; <tt>HEAD</tt> &lt;commit&gt;&#8230;) 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 &lt;msg&gt; &lt;commit&gt;&#8230;</tt>.</p></div>

+new scripts.  It is the same as <tt>git merge -m &lt;msg&gt; &lt;commit&gt;...</tt>.</p></div>

 <div class="paragraph"><p>The third syntax ("<tt>git merge --abort</tt>") 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,

@@ -710,7 +710,7 @@ set to <tt>no</tt> at the beginning of them.</p></div>
 <p>

         In addition to branch names, populate the log message with

         one-line descriptions from at most &lt;n&gt; actual commits that are being

-        merged. See also <a href="git-fmt-merge-msg.html">git-fmt-merge-msg(1)</a>.

+        merged. See also .

 </p>

 <div class="paragraph"><p>With --no-log do not list one-line descriptions from the

 actual commits being merged.</p></div>

@@ -888,7 +888,7 @@ See also the configuration section of this manual page.</p></div>
 <div class="sectionbody">

 <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>.

+there are conflicts.  See also .

 <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>

@@ -1177,7 +1177,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  <tt>--patience</tt>.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1194,7 +1194,7 @@ 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

+        See also  <tt>-b</tt>, <tt>-w</tt>, and

         <tt>--ignore-space-at-eol</tt>.

 </p>

 <div class="ulist"><ul>

@@ -1227,7 +1227,7 @@ renormalize
         meant to be used when merging branches with different clean

         filters or end-of-line normalization rules.  See "Merging

         branches with differing checkin/checkout attributes" in

-        <a href="gitattributes.html">gitattributes(5)</a> for details.

+         for details.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1245,7 +1245,7 @@ rename-threshold=&lt;n&gt;
 <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  <tt>-M</tt>.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1380,7 +1380,7 @@ merge.renormalize
         recorded in commits to a canonical form before performing a

         merge to reduce unnecessary conflicts.  For more information,

         see section "Merging branches with differing checkin/checkout

-        attributes" in <a href="gitattributes.html">gitattributes(5)</a>.

+        attributes" in .

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1398,7 +1398,7 @@ merge.tool
 <dd>

 <p>

         Controls which merge resolution program is used by

-        <a href="git-mergetool.html">git-mergetool(1)</a>.  Valid built-in values are: "araxis",

+        .  Valid built-in values are: "araxis",

         "bc3", "diffuse", "ecmerge", "emerge", "gvimdiff", "kdiff3", "meld",

         "opendiff", "p4merge", "tkdiff", "tortoisemerge", "vimdiff"

         and "xxdiff".  Any other value is treated is custom merge tool

@@ -1424,7 +1424,7 @@ merge.&lt;driver&gt;.name
 <dd>

 <p>

         Defines a human-readable name for a custom low-level

-        merge driver.  See <a href="gitattributes.html">gitattributes(5)</a> for details.

+        merge driver.  See  for details.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1433,7 +1433,7 @@ merge.&lt;driver&gt;.driver
 <dd>

 <p>

         Defines the command that implements a custom low-level

-        merge driver.  See <a href="gitattributes.html">gitattributes(5)</a> for details.

+        merge driver.  See  for details.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1443,7 +1443,7 @@ merge.&lt;driver&gt;.recursive
 <p>

         Names a low-level merge driver to be used when

         performing an internal merge between common ancestors.

-        See <a href="gitattributes.html">gitattributes(5)</a> for details.

+        See  for details.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1460,16 +1460,15 @@ branch.&lt;name&gt;.mergeoptions
 </div>

 <h2 id="_see_also">SEE ALSO</h2>

 <div class="sectionbody">

-<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>,

-<a href="git-add.html">git-add(1)</a>, <a href="git-rm.html">git-rm(1)</a>,

-<a href="git-mergetool.html">git-mergetool(1)</a></p></div>

+<div class="paragraph"><p>, ,

+,

+,

+, ,

+, ,</p></div>

 </div>

 <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 class="paragraph"><p>Part of the  suite</p></div>

 </div>

 </div>

 <div id="footnotes"><hr /></div>