Autogenerated HTML docs for v1.6.1-rc2-14-g5363d

1 files changed, 25 insertions, 25 deletions

diff --git a/git-merge.html b/git-merge.html
index feaf80e4d..6542e18e1 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -375,7 +375,7 @@ new scripts.  It is the same as <tt>git merge -m &lt;msg&gt; &lt;remote&gt;</tt>
 </dt>

 <dd>

 <p>

-        Do not show diffstat at the end of the merge.

+        Do not show a diffstat at the end of the merge.

 </p>

 </dd>

 <dt>

@@ -589,10 +589,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 <tt>&lt;&lt;&lt;&lt;&lt;&lt;&lt;</tt> conflict marker, change made by one side,

-        <tt>=======</tt> marker, change made by the other side, and then

-        <tt>&gt;&gt;&gt;&gt;&gt;&gt;&gt;</tt> marker.  An alternate style, "diff3", adds <tt>|||||||</tt>

-        marker and the original text before <tt>=======</tt> marker.

+        shows a <tt>&lt;&lt;&lt;&lt;&lt;&lt;&lt;</tt> conflict marker, changes made by one side,

+        a <tt>=======</tt> marker, changes made by the other side, and then

+        a <tt>&gt;&gt;&gt;&gt;&gt;&gt;&gt;</tt> marker.  An alternate style, "diff3", adds a <tt>|||||||</tt>

+        marker and the original text before the <tt>=======</tt> marker.

 </p>

 </dd>

 <dt>

@@ -645,7 +645,7 @@ merge.verbosity
         message if conflicts were detected. Level 1 outputs only

         conflicts, 2 outputs conflicts and file changes.  Level 5 and

         above outputs debugging information.  The default is level 2.

-        Can be overridden by <em>GIT_MERGE_VERBOSITY</em> environment variable.

+        Can be overridden by the <em>GIT_MERGE_VERBOSITY</em> environment variable.

 </p>

 </dd>

 <dt>

@@ -653,7 +653,7 @@ merge.&lt;driver&gt;.name
 </dt>

 <dd>

 <p>

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

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

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

 </p>

 </dd>

@@ -708,10 +708,10 @@ The merged commit is already contained in <tt>HEAD</tt>. This is the
 <li>

 <p>

 <tt>HEAD</tt> is already contained in the merged commit. This is the

-  most common case especially when involved through <em>git pull</em>:

-  you are tracking an upstream repository, committed no local

+  most common case especially when invoked from <em>git pull</em>:

+  you are tracking an upstream repository, have committed no local

   changes and now you want to update to a newer upstream revision.

-  Your <tt>HEAD</tt> (and the index) is updated to at point the merged

+  Your <tt>HEAD</tt> (and the index) is updated to point at the merged

   commit, without creating an extra merge commit.  This is

   called "Fast-forward".

 </p>

@@ -719,14 +719,14 @@ The merged commit is already contained in <tt>HEAD</tt>. This is the
 <li>

 <p>

 Both the merged commit and <tt>HEAD</tt> are independent and must be

-  tied together by a merge commit that has them both as its parents.

+  tied together by a merge commit that has both of them as its parents.

   The rest of this section describes this "True merge" case.

 </p>

 </li>

 </ul></div>

 <div class="para"><p>The chosen merge strategy merges the two commits into a single

 new source tree.

-When things cleanly merge, these things happen:</p></div>

+When things merge cleanly, this is what happens:</p></div>

 <div class="olist"><ol>

 <li>

 <p>

@@ -751,15 +751,15 @@ The <tt>HEAD</tt> pointer gets advanced.
 </li>

 </ol></div>

 <div class="para"><p>Because of 2., we require that the original state of the index

-file to match exactly the current <tt>HEAD</tt> commit; otherwise we

+file matches exactly the current <tt>HEAD</tt> commit; otherwise we

 will write out your local changes already registered in your

 index file along with the merge result, which is not good.

-Because 1. involves only the paths different between your

+Because 1. involves only those paths differing between your

 branch and the remote branch you are pulling from during the

 merge (which is typically a fraction of the whole tree), you can

 have local modifications in your working tree as long as they do

 not overlap with what the merge updates.</p></div>

-<div class="para"><p>When there are conflicts, these things happen:</p></div>

+<div class="para"><p>When there are conflicts, the following happens:</p></div>

 <div class="olist"><ol>

 <li>

 <p>

@@ -778,8 +778,8 @@ For conflicting paths, the index file records up to three
    versions; stage1 stores the version from the common ancestor,

    stage2 from <tt>HEAD</tt>, and stage3 from the remote branch (you

    can inspect the stages with <tt>git ls-files -u</tt>).  The working

-   tree files have the result of "merge" program; i.e. 3-way

-   merge result with familiar conflict markers <tt>&lt;&lt;&lt; === &gt;&gt;&gt;</tt>.

+   tree files contain the result of the "merge" program; i.e. 3-way

+   merge results with familiar conflict markers <tt>&lt;&lt;&lt; === &gt;&gt;&gt;</tt>.

 </p>

 </li>

 <li>

@@ -815,12 +815,12 @@ Git makes conflict resolution easy.
 &gt;&gt;&gt;&gt;&gt;&gt;&gt; theirs:sample.txt

 And here is another line that is cleanly resolved or unmodified.</tt></pre>

 </div></div>

-<div class="para"><p>The area a pair of conflicting changes happened is marked with markers

+<div class="para"><p>The area where a pair of conflicting changes happened is marked with markers

 "<tt>&lt;&lt;&lt;&lt;&lt;&lt;&lt;</tt>", "<tt>=======</tt>", and "<tt>&gt;&gt;&gt;&gt;&gt;&gt;&gt;</tt>".  The part before the "<tt>=======</tt>"

-is typically your side, and the part after it is typically their side.</p></div>

-<div class="para"><p>The default format does not show what the original said in the conflicted

-area.  You cannot tell how many lines are deleted and replaced with the

-Barbie's remark by your side.  The only thing you can tell is that your

+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

+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

 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"

@@ -853,7 +853,7 @@ viewing the original.</p></div>
 <div class="ilist"><ul>

 <li>

 <p>

-Decide not to merge.  The only clean-up you need are to reset

+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.; <em>git-reset --hard</em> can

    be used for this.

@@ -863,7 +863,7 @@ Decide not to merge.  The only clean-up you need are to reset
 <p>

 Resolve the conflicts.  Git will mark the conflicts in

    the working tree.  Edit the files into shape and

-   <em>git-add</em> to the index.  <em>git-commit</em> to seal the deal.

+   <em>git-add</em> them to the index.  Use <em>git-commit</em> to seal the deal.

 </p>

 </li>

 </ul></div>

@@ -920,7 +920,7 @@ Look at the originals.  <em>git show :1:filename</em> shows the
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2008-11-28 06:26:51 UTC

+Last updated 2008-12-10 08:33:20 UTC

 </div>

 </div>

 </body>