Autogenerated HTML docs for v1.7.5-185-g0b9dee

1 files changed, 30 insertions, 12 deletions

diff --git a/git-rev-list.html b/git-rev-list.html
index 3d237a0ca..bd34f7cc3 100644
--- a/git-rev-list.html
+++ b/git-rev-list.html
@@ -1435,31 +1435,49 @@ people using 80-column terminals.</p></div>
 </p>

 </dd>

 <dt class="hdlist1">

---no-notes

-</dt>

-<dt class="hdlist1">

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

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

 </dt>

 <dd>

 <p>

         Show the notes (see <a href="git-notes.html">git-notes(1)</a>) that annotate the

         commit, when showing the commit log message.  This is the default

         for <tt>git log</tt>, <tt>git show</tt> and <tt>git whatchanged</tt> commands when

-        there is no <tt>--pretty</tt>, <tt>--format</tt> nor <tt>--oneline</tt> option is

-        given on the command line.

+        there is no <tt>--pretty</tt>, <tt>--format</tt> nor <tt>--oneline</tt> option given

+        on the command line.

+</p>

+<div class="paragraph"><p>By default, the notes shown are from the notes refs listed in the

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

+environment overrides). See <a href="git-config.html">git-config(1)</a> for more details.</p></div>

+<div class="paragraph"><p>With an optional <em>&lt;ref&gt;</em> argument, show this notes ref instead of the

+default notes ref(s). The ref is taken to be in <tt>refs/notes/</tt> if it

+is not qualified.</p></div>

+<div class="paragraph"><p>Multiple --notes options can be combined to control which notes are

+being displayed. Examples: "--notes=foo" will show only notes from

+"refs/notes/foo"; "--notes=foo --notes" will show both notes from

+"refs/notes/foo" and from the default notes ref(s).</p></div>

+</dd>

+<dt class="hdlist1">

+--no-notes

+</dt>

+<dd>

+<p>

+        Do not show notes. This negates the above <tt>--notes</tt> option, by

+        resetting the list of notes refs from which notes are shown.

+        Options are parsed in the order given on the command line, so e.g.

+        "--notes --notes=foo --no-notes --notes=bar" will only show notes

+        from "refs/notes/bar".

 </p>

-<div class="paragraph"><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 class="hdlist1">

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

+</dt>

+<dt class="hdlist1">

 --[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>.

+        These options are deprecated. Use the above --notes/--no-notes

+        options instead.

 </p>

 </dd>

 <dt class="hdlist1">