grep branch, master, updated. v3.5-4-g3320f8d

[Paul Eggert]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  3320f8db4c7205e213dac6bc8b11ecca9de58ac0 (commit)
      from  c1bd3a955fdc2b95f9267a9a83e475b4e924c2f2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=3320f8db4c7205e213dac6bc8b11ecca9de58ac0


commit 3320f8db4c7205e213dac6bc8b11ecca9de58ac0
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Sat Oct 3 12:41:38 2020 -0700

    doc: document --include/--exclude better
    
    Problem reported by John Ruckstuhl (Bug#43782).
    * doc/grep.texi (File and Directory Selection):
    Document what happens if contradictory options are given,
    or if no option matches a file name.
    * doc/grep.in.1:

diff --git a/doc/grep.in.1 b/doc/grep.in.1
index 91c0bca..7d5dfe5 100644
--- a/doc/grep.in.1
+++ b/doc/grep.in.1
@@ -680,6 +680,17 @@ Search only files whose base name matches
 .I GLOB
 (using wildcard matching as described under
 .BR \-\^\-exclude ).
+If contradictory
+.B \-\^\-include
+and
+.B \-\^\-exclude
+options are given, the last matching one wins.
+If no
+.B \-\^\-include
+or
+.B \-\^\-exclude
+options match, a file is included unless the first such option is
+.BR \-\^\-include .
 .TP
 .BR \-r ", " \-\^\-recursive
 Read all files under each directory, recursively,
diff --git a/doc/grep.texi b/doc/grep.texi
index bb76ae1..0c0bb12 100644
--- a/doc/grep.texi
+++ b/doc/grep.texi
@@ -728,6 +728,10 @@ this is equivalent to the 
@samp{--binary-files=without-match} option.
 @cindex searching directory trees
 Search only files whose name matches @var{glob},
 using wildcard matching as described under @option{--exclude}.
+If contradictory @option{--include} and @option{--exclude} options are
+given, the last matching one wins.  If no @option{--include} or
+@option{--exclude} options match, a file is included unless the first
+such option is @option{--include}.
 
 @item -r
 @itemx --recursive

-----------------------------------------------------------------------

Summary of changes:
 doc/grep.in.1 | 11 +++++++++++
 doc/grep.texi |  4 ++++
 2 files changed, 15 insertions(+)


hooks/post-receive
-- 
grep