Autogenerated HTML docs for v2.13.0-rc2

1 files changed, 4 insertions, 3 deletions

diff --git a/git-pull.html b/git-pull.html
index a63b657cf..5a6cfd85d 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -800,7 +800,7 @@ are presented and handled.</p></div>
 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,

-the merge will be automatically cancelled and the work tree untouched.

+the merge will be automatically canceled and the work tree untouched.

 It is generally best to get any local changes in working order before

 pulling or stash them away with <a href="git-stash.html">git-stash(1)</a>.</p></div>

 </div>

@@ -1886,7 +1886,8 @@ Update the remote-tracking branches for the repository
 </p>

 <div class="listingblock">

 <div class="content">

-<pre><code>$ git pull, git pull origin</code></pre>

+<pre><code>$ git pull

+$ git pull origin</code></pre>

 </div></div>

 <div class="paragraph"><p>Normally the branch merged in is the HEAD of the remote repository,

 but the choice is determined by the branch.&lt;name&gt;.remote and

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

 <div id="footer">

 <div id="footer-text">

-Last updated 2017-01-10 15:42:58 PST

+Last updated 2017-05-04 07:33:43 PDT

 </div>

 </div>

 </body>