From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 31 Aug 2015 22:38:54 +0000 (-0700)
Subject: Merge branch 'jk/rev-list-has-no-notes'
X-Git-Tag: v2.6.0-rc0~23
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0bb71fb36d60902a2efffd7e6df1cc821884e67c?hp=-c

Merge branch 'jk/rev-list-has-no-notes'

"git rev-list" does not take "--notes" option, but did not complain
when one is given.

* jk/rev-list-has-no-notes:
rev-list: make it obvious that we do not support notes
---

0bb71fb36d60902a2efffd7e6df1cc821884e67c
diff --combined Documentation/rev-list-options.txt
index a9b808fab3,31bee069aa..f1c52208f0
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@@ -58,9 -58,11 +58,11 @@@ endif::git-rev-list[
  	more than one `--grep=<pattern>`, commits whose message
  	matches any of the given patterns are chosen (but see
  	`--all-match`).
+ ifndef::git-rev-list[]
  +
  When `--show-notes` is in effect, the message from the notes is
  matched as if it were part of the log message.
+ endif::git-rev-list[]
  
  --all-match::
  	Limit the commits output to ones that match all given `--grep`,
@@@ -727,11 -729,6 +729,11 @@@ format, often found in email messages
  +
  `--date=raw` shows the date in the internal raw Git format `%s %z` format.
  +
 +`--date=format:...` feeds the format `...` to your system `strftime`.
 +Use `--date=format:%c` to show the date in your system locale's
 +preferred format.  See the `strftime` manual for a complete list of
 +format placeholders.
 ++
  `--date=default` shows timestamps in the original time zone
  (either committer's or author's).