Autogenerated HTML docs for v1.7.3.1-45-g9855

1 files changed, 4 insertions, 4 deletions

diff --git a/git-pull.html b/git-pull.html
index 896650840..7bcb6575a 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -433,7 +433,7 @@ inspect and further tweak the merge result before committing.</p></div>
 resolved as a fast-forward.</p></div>

 </dd>

 <dt>

---log

+--log[=&lt;n&gt;]

 </dt>

 <dt>

 --no-log

@@ -441,8 +441,8 @@ resolved as a fast-forward.</p></div>
 <dd>

 <p>

         In addition to branch names, populate the log message with

-        one-line descriptions from the actual commits that are being

-        merged.

+        one-line descriptions from at most &lt;n&gt; actual commits that are being

+        merged. See also <a href="git-fmt-merge-msg.html">git-fmt-merge-msg(1)</a>.

 </p>

 <div class="para"><p>With --no-log do not list one-line descriptions from the

 actual commits being merged.</p></div>

@@ -1279,7 +1279,7 @@ Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p></div>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2010-09-18 23:56:52 UTC

+Last updated 2010-09-30 00:02:58 UTC

 </div>

 </div>

 </body>