You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
61 lines
1.7 KiB
61 lines
1.7 KiB
diff --git a/doc/grep.in.1 b/doc/grep.in.1 |
|
index 91c0bca..d2cf00a 100644 |
|
--- a/doc/grep.in.1 |
|
+++ b/doc/grep.in.1 |
|
@@ -464,7 +464,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 |
|
@@ -477,7 +477,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 |
|
@@ -490,13 +490,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 |
|
diff --git a/src/grep.c b/src/grep.c |
|
index de7616a..a530988 100644 |
|
--- a/src/grep.c |
|
+++ b/src/grep.c |
|
@@ -2047,6 +2047,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\
|
|
|