grep/grep-2.28-man-fix-gs.patch

62 lines
1.7 KiB
Diff
Raw Normal View History

diff --git a/doc/grep.in.1 b/doc/grep.in.1
index e3472f7..28709f7 100644
--- a/doc/grep.in.1
+++ b/doc/grep.in.1
2016-10-03 21:21:46 +00:00
@@ -327,7 +327,7 @@ Print
.I NUM
lines of trailing context after matching lines.
Places a line containing a group separator
-.RB ( \-\^\- )
+.RB "(described under " \-\^\-group\-separator )
between contiguous groups of matches.
With the
.B \-o
2016-10-03 21:21:46 +00:00
@@ -340,7 +340,7 @@ Print
.I NUM
lines of leading context before matching lines.
Places a line containing a group separator
-.RB ( \-\^\- )
+.RB "(described under " \-\^\-group\-separator )
between contiguous groups of matches.
With the
.B \-o
2016-10-03 21:21:46 +00:00
@@ -353,13 +353,24 @@ Print
.I NUM
lines of output context.
Places a line containing a group separator
-.RB ( \-\^\- )
+.RB "(described under " \-\^\-group\-separator )
between contiguous groups of matches.
With the
.B \-o
or
.B \-\^\-only\-matching
option, this has no effect and a warning is given.
+.TP
+.BI \-\^\-group\-separator= SEP
+Use
+.I SEP
+as a group separator. By default
+.I SEP
+is double hyphen
+.RB ( \-\^\- ).
+.TP
+.B \-\^\-no\-group-separator
+Use empty string as a group separator.
.SS "File and Directory Selection"
.TP
.BR \-a ", " \-\^\-text
2014-05-23 10:22:32 +00:00
diff --git a/src/grep.c b/src/grep.c
index 81654c3..8c2054b 100644
2014-05-23 10:22:32 +00:00
--- a/src/grep.c
+++ b/src/grep.c
@@ -2003,6 +2003,8 @@ Context control:\n\
"));
printf (_("\
-NUM same as --context=NUM\n\
+ --group-separator=SEP use SEP as a group separator\n\
+ --no-group-separator use empty string as a group separator\n\
--color[=WHEN],\n\
--colour[=WHEN] use markers to highlight the matching strings;\n\
WHEN is 'always', 'never', or 'auto'\n\