[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
grep branch, master, updated. v3.11-13-g13fd827
From: |
Paul Eggert |
Subject: |
grep branch, master, updated. v3.11-13-g13fd827 |
Date: |
Sat, 5 Aug 2023 17:58:44 -0400 (EDT) |
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 13fd8279e5fdd15ba711cf6e5eadeece89e85909 (commit)
from d1c3fbe7722662b449bae23130b644c726473fe3 (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=13fd8279e5fdd15ba711cf6e5eadeece89e85909
commit 13fd8279e5fdd15ba711cf6e5eadeece89e85909
Author: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat Aug 5 14:58:09 2023 -0700
doc: clarify -- role
This should fix bug#65046 reported by Helmut Waltzmann.
diff --git a/doc/grep.in.1 b/doc/grep.in.1
index 236791e..01f753a 100644
--- a/doc/grep.in.1
+++ b/doc/grep.in.1
@@ -1299,7 +1299,7 @@ contain \*(lqg\*(rq and end in \*(lq.h\*(rq.
The
.B \-n
option outputs line numbers, the
-.B \-\-
+.B \-\^\-
argument treats expansions of \*(lq*g*.h\*(rq starting with \*(lq\-\*(rq
as file names not options,
and the empty file /dev/null causes file names to be output
@@ -1307,7 +1307,7 @@ even if only one file name happens to be of the form
\*(lq*g*.h\*(rq.
.PP
.in +2n
.EX
-$ \fBgrep\fP \-n \-\- 'f.*\e.c$' *g*.h /dev/null
+$ \fBgrep\fP \-n \-\^\- 'f.*\e.c$' *g*.h /dev/null
argmatch.h:1:/* definitions and prototypes for argmatch.c
.EE
.in
diff --git a/doc/grep.texi b/doc/grep.texi
index 594ac1f..42b499a 100644
--- a/doc/grep.texi
+++ b/doc/grep.texi
@@ -555,7 +555,7 @@ Print @var{num} lines of leading and trailing output
context.
@opindex --group-separator
@cindex group separator
When @option{-A}, @option{-B} or @option{-C} are in use,
-print @var{string} instead of @option{--} between groups of lines.
+print @var{string} instead of @samp{--} between groups of lines.
@item --no-group-separator
@opindex --group-separator
@@ -770,10 +770,10 @@ directory, recursively, following all symbolic links.
@item --
@opindex --
@cindex option delimiter
-Delimit the option list. Later arguments, if any, are treated as
-operands even if they begin with @samp{-}. For example, @samp{grep PAT --
--file1 file2} searches for the pattern PAT in the files named @file{-file1}
-and @file{file2}.
+Delimit the option list. Any later argument is not treated as an
+option even if it begins with @samp{-}. For example,
+@samp{grep -- -PAT -file1 file2} searches for the pattern @samp{-PAT}
+in the files named @file{-file1} and @file{file2}.
@item --line-buffered
@opindex --line-buffered
-----------------------------------------------------------------------
Summary of changes:
doc/grep.in.1 | 4 ++--
doc/grep.texi | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
hooks/post-receive
--
grep
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- grep branch, master, updated. v3.11-13-g13fd827,
Paul Eggert <=