From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 Apr 2015 20:00:20 +0000 (-0700)
Subject: Merge branch 'mg/show-notes-doc'
X-Git-Tag: v2.4.0~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3f5872603d00d4a0e5d2ca4c5e8772fa4667dda8;p=thirdparty%2Fgit.git

Merge branch 'mg/show-notes-doc'

Documentation fix.

* mg/show-notes-doc:
  rev-list-options.txt: complete sentence about notes matching
---

3f5872603d00d4a0e5d2ca4c5e8772fa4667dda8
diff --cc Documentation/rev-list-options.txt
index f620ee4e1c,06e4cfdbc5..77ac439234
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@@ -59,25 -67,17 +59,25 @@@ endif::git-rev-list[
  	matches any of the given patterns are chosen (but see
  	`--all-match`).
  +
- When `--show-notes` is in effect, the message from the notes as
- if it is part of the log message.
+ When `--show-notes` is in effect, the message from the notes is
+ matched as if it were part of the log message.
  
  --all-match::
 -	Limit the commits output to ones that match all given --grep,
 +	Limit the commits output to ones that match all given `--grep`,
  	instead of ones that match at least one.
  
 +--invert-grep::
 +	Limit the commits output to ones with log message that do not
 +	match the pattern specified with `--grep=<pattern>`.
 +
  -i::
  --regexp-ignore-case::
 +	Match the regular expression limiting patterns without regard to letter
 +	case.
  
 -	Match the regexp limiting patterns without regard to letters case.
 +--basic-regexp::
 +	Consider the limiting patterns to be basic regular expressions;
 +	this is the default.
  
  -E::
  --extended-regexp::