Autogenerated HTML docs for v1.5.0-rc1-g5fe3

1 files changed, 6 insertions, 6 deletions

diff --git a/git-rerere.html b/git-rerere.html
index d5b299cb7..a43098e16 100644
--- a/git-rerere.html
+++ b/git-rerere.html
@@ -362,7 +362,7 @@ One way to do it is to pull master into the topic branch:</p>
 <div class="listingblock">

 <div class="content">

 <pre><tt>        $ git checkout topic

-        $ git pull . master

+        $ git merge master

 

               o---*---o---+ topic

              /           /

@@ -382,10 +382,10 @@ in which case the final commit graph would look like this:</p>
 <div class="listingblock">

 <div class="content">

 <pre><tt>        $ git checkout topic

-        $ git pull . master

+        $ git merge master

         $ ... work on both topic and master branches

         $ git checkout master

-        $ git pull . topic

+        $ git merge topic

 

               o---*---o---+---o---o topic

              /           /         \

@@ -403,11 +403,11 @@ top of the tip before the test merge:</p>
 <div class="listingblock">

 <div class="content">

 <pre><tt>        $ git checkout topic

-        $ git pull . master

+        $ git merge master

         $ git reset --hard HEAD^ ;# rewind the test merge

         $ ... work on both topic and master branches

         $ git checkout master

-        $ git pull . topic

+        $ git merge topic

 

               o---*---o-------o---o topic

              /                     \

@@ -482,7 +482,7 @@ conflict.</p>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 27-Dec-2006 10:59:44 UTC

+Last updated 15-Jan-2007 06:12:33 UTC

 </div>

 </div>

 </body>