Autogenerated HTML docs for v1.8.5-rc1

1 files changed, 5 insertions, 3 deletions

diff --git a/git-pull.html b/git-pull.html
index 883c627e8..d0e108476 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -776,7 +776,9 @@ as set by <a href="git-branch.html">git-branch(1)</a> <code>--track</code>.</p><
 <div class="content">

 <pre><code>          A---B---C master on origin

          /

-    D---E---F---G master</code></pre>

+    D---E---F---G master

+        ^

+        origin/master in your repository</code></pre>

 </div></div>

 <div class="paragraph"><p>Then "<code>git pull</code>" will fetch and replay the changes from the remote

 <code>master</code> branch since it diverged from the local <code>master</code> (i.e., <code>E</code>)

@@ -785,7 +787,7 @@ result in a new commit along with the names of the two parent commits
 and a log message from the user describing the changes.</p></div>

 <div class="listingblock">

 <div class="content">

-<pre><code>          A---B---C remotes/origin/master

+<pre><code>          A---B---C origin/master

          /         \

     D---E---F---G---H master</code></pre>

 </div></div>

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

 <div id="footer">

 <div id="footer-text">

-Last updated 2013-09-11 15:57:23 PDT

+Last updated 2013-11-06 15:55:05 PST

 </div>

 </div>

 </body>