Autogenerated HTML docs for v1.8.1.2-545-g2f19ad

1 files changed, 8 insertions, 8 deletions

diff --git a/git-pull.html b/git-pull.html
index 476dbfe93..50280fed8 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -791,8 +791,8 @@ and a log message from the user describing the changes.</p></div>
 </div></div>

 <div class="paragraph"><p>See <a href="git-merge.html">git-merge(1)</a> for details, including how conflicts

 are presented and handled.</p></div>

-<div class="paragraph"><p>In git 1.7.0 or later, to cancel a conflicting merge, use

-<code>git reset --merge</code>.  <strong>Warning</strong>: In older versions of git, running <em>git pull</em>

+<div class="paragraph"><p>In Git 1.7.0 or later, to cancel a conflicting merge, use

+<code>git reset --merge</code>.  <strong>Warning</strong>: In older versions of Git, running <em>git pull</em>

 with uncommitted changes is discouraged: while possible, it leaves you

 in a state that may be hard to back out of in the case of a conflict.</p></div>

 <div class="paragraph"><p>If any of the remote changes overlap with local uncommitted changes,

@@ -839,7 +839,7 @@ must be given before the options meant for <em>git fetch</em>.</p></div>
         This option controls if new commits of all populated submodules should

         be fetched too (see <a href="git-config.html">git-config(1)</a> and <a href="gitmodules.html">gitmodules(5)</a>).

         That might be necessary to get the data needed for merging submodule

-        commits, a feature git learned in 1.7.3. Notice that the result of a

+        commits, a feature Git learned in 1.7.3. Notice that the result of a

         merge will not be checked out in the submodule, "git submodule update"

         has to be called afterwards to bring the work tree up to date with the

         merge result.

@@ -1371,7 +1371,7 @@ git://host.xz&#91;:port&#93;/~&#91;user&#93;/path/to/repo.git/
 </p>

 </li>

 </ul></div>

-<div class="paragraph"><p>For local repositories, also supported by git natively, the following

+<div class="paragraph"><p>For local repositories, also supported by Git natively, the following

 syntaxes may be used:</p></div>

 <div class="ulist"><ul>

 <li>

@@ -1388,7 +1388,7 @@ syntaxes may be used:</p></div>
 <div class="paragraph"><p>These two syntaxes are mostly equivalent, except when cloning, when

 the former implies --local option. See <a href="git-clone.html">git-clone(1)</a> for

 details.</p></div>

-<div class="paragraph"><p>When git doesn&#8217;t know how to handle a certain transport protocol, it

+<div class="paragraph"><p>When Git doesn&#8217;t know how to handle a certain transport protocol, it

 attempts to use the <em>remote-&lt;transport&gt;</em> remote helper, if one

 exists. To explicitly request a remote helper, the following syntax

 may be used:</p></div>

@@ -1446,7 +1446,7 @@ of a URL as <code>&lt;repository&gt;</code> argument:</p></div>
 <div class="ulist"><ul>

 <li>

 <p>

-a remote in the git configuration file: <code>$GIT_DIR/config</code>,

+a remote in the Git configuration file: <code>$GIT_DIR/config</code>,

 </p>

 </li>

 <li>

@@ -1830,7 +1830,7 @@ would want to start over, you can recover with <em>git reset</em>.</p></div>
 out submodules right now. When e.g. upstream added a new submodule in the

 just fetched commits of the superproject the submodule itself can not be

 fetched, making it impossible to check out that submodule later without

-having to do a fetch again. This is expected to be fixed in a future git

+having to do a fetch again. This is expected to be fixed in a future Git

 version.</p></div>

 </div>

 </div>

@@ -1850,7 +1850,7 @@ version.</p></div>
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2012-08-22 12:54:47 PDT

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

 </div>

 </div>

 </body>