Autogenerated HTML docs for v1.8.1.2-545-g2f19ad

1 files changed, 7 insertions, 7 deletions

diff --git a/git-merge.html b/git-merge.html
index d539fe2f0..b6f70fe09 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -1144,9 +1144,9 @@ 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

+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="paragraph"><p>By default, git uses the same style as the one used by the "merge" program

+<div class="paragraph"><p>By default, Git uses the same style as the one used by the "merge" program

 from the RCS suite to present such a conflicted hunk, like this:</p></div>

 <div class="listingblock">

 <div class="content">

@@ -1521,10 +1521,10 @@ merge.ff
 </dt>

 <dd>

 <p>

-        By default, git does not create an extra merge commit when merging

+        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 <code>false</code>,

-        this variable tells git to create an extra merge commit in such

+        this variable tells Git to create an extra merge commit in such

         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

@@ -1557,10 +1557,10 @@ merge.renormalize
 </dt>

 <dd>

 <p>

-        Tell git that canonical representation of files in the

+        Tell Git that canonical representation of files in the

         repository has changed over time (e.g. earlier commits record

         text files with CRLF line endings, but recent ones use LF line

-        endings).  In such a repository, git can convert the data

+        endings).  In such a repository, Git can convert the data

         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

@@ -1664,7 +1664,7 @@ branch.&lt;name&gt;.mergeoptions
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2012-11-13 14:31:09 PST

+Last updated 2013-02-05 21:07:26 PST

 </div>

 </div>

 </body>