Autogenerated HTML docs for v1.6.1.1-223-gc30e5

1 files changed, 2 insertions, 4 deletions

diff --git a/gittutorial.html b/gittutorial.html
index 4d4ad7fea..bfa6089ce 100644
--- a/gittutorial.html
+++ b/gittutorial.html
@@ -574,9 +574,7 @@ alice$ git pull /home/bob/myrepo master</tt></pre>
 </div></div>

 <div class="para"><p>This merges the changes from Bob's "master" branch into Alice's

 current branch.  If Alice has made her own changes in the meantime,

-then she may need to manually fix any conflicts.  (Note that the

-"master" argument in the above command is actually unnecessary, as it

-is the default.)</p></div>

+then she may need to manually fix any conflicts.</p></div>

 <div class="para"><p>The "pull" command thus performs two operations: it fetches changes

 from a remote branch, then merges them into the current branch.</p></div>

 <div class="para"><p>Note that in general, Alice would want her local changes committed before

@@ -911,7 +909,7 @@ digressions that may be interesting at this point are:</p></div>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2009-01-06 05:56:06 UTC

+Last updated 2009-01-26 06:35:40 UTC

 </div>

 </div>

 </body>