Autogenerated HTML docs for v1.7.0.3-291-g5e4f

1 files changed, 17 insertions, 3 deletions

diff --git a/git-diff-tree.html b/git-diff-tree.html
index de6397f63..e37600044 100644
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -994,7 +994,7 @@ people using 80-column terminals.</p></div>
 --no-notes

 </dt>

 <dt>

---show-notes

+--show-notes[=&lt;ref&gt;]

 </dt>

 <dd>

 <p>

@@ -1004,6 +1004,19 @@ people using 80-column terminals.</p></div>
         there is no <tt>--pretty</tt>, <tt>--format</tt> nor <tt>--oneline</tt> option is

         given on the command line.

 </p>

+<div class="para"><p>With an optional argument, add this ref to the list of notes.  The ref

+is taken to be in <tt>refs/notes/</tt> if it is not qualified.</p></div>

+</dd>

+<dt>

+--[no-]standard-notes

+</dt>

+<dd>

+<p>

+        Enable or disable populating the notes ref list from the

+        <em>core.notesRef</em> and <em>notes.displayRef</em> variables (or

+        corresponding environment overrides).  Enabled by default.

+        See <a href="git-config.html">git-config(1)</a>.

+</p>

 </dd>

 <dt>

 --no-commit-id

@@ -1806,7 +1819,8 @@ file made it into the new one.</p></div>
 <div class="sectionbody">

 <div class="para"><p>"git-diff-tree", "git-diff-files" and "git-diff" can take <em>-c</em> or

 <em>--cc</em> option to produce <em>combined diff</em>.  For showing a merge commit

-with "git log -p", this is the default format.

+with "git log -p", this is the default format; you can force showing

+full diff with the <em>-m</em> option.

 A <em>combined diff</em> format looks like this:</p></div>

 <div class="listingblock">

 <div class="content">

@@ -2055,7 +2069,7 @@ the pathname, but if that is <tt>NUL</tt>, the record will show two paths.</p></
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2010-03-03 05:12:40 UTC

+Last updated 2010-03-25 00:38:22 UTC

 </div>

 </div>

 </body>