From f0d3cae56963a912a6e50bc7c4d11416e4ef4989 Mon Sep 17 00:00:00 2001 From: Andrew Gallant Date: Sun, 12 Mar 2017 20:24:45 -0400 Subject: Clarify -u/--unrestricted flags. Fixes #340 --- doc/rg.1 | 15 +++++++++++++++ doc/rg.1.md | 4 ++++ 2 files changed, 19 insertions(+) diff --git a/doc/rg.1 b/doc/rg.1 index 1b66f2a2..de0d5910 100644 --- a/doc/rg.1 +++ b/doc/rg.1 @@ -127,6 +127,12 @@ Two \-u flags will search hidden files and directories. Three \-u flags will search binary files. \-uu is equivalent to grep \-r, and \-uuu is equivalent to grep \-a \-r. .RS +.PP +Note that the \-u flags are convenient aliases for other combinations of +flags. +\-u aliases \[aq]\-\-no\-ignore\[aq]. +\-uu aliases \[aq]\-\-no\-ignore \-\-hidden\[aq]. +\-uuu aliases \[aq]\-\-no\-ignore \-\-hidden \-\-text\[aq]. .RE .TP .B \-v, \-\-invert\-match @@ -199,6 +205,15 @@ Show debug messages. .RS .RE .TP +.B \-E, \-\-encoding \f[I]ENCODING\f[] +Specify the text encoding that ripgrep will use on all files searched. +The default value is \[aq]auto\[aq], which will cause ripgrep to do a +best effort automatic detection of encoding on a per\-file basis. +Other supported values can be found in the list of labels here: +https://encoding.spec.whatwg.org/#concept\-encoding\-get +.RS +.RE +.TP .B \-f, \-\-file FILE ... Search for patterns from the given file, with one pattern per line. When this flag is used or multiple times or in combination with the diff --git a/doc/rg.1.md b/doc/rg.1.md index 7c49eb72..fce63c56 100644 --- a/doc/rg.1.md +++ b/doc/rg.1.md @@ -89,6 +89,10 @@ Project home page: https://github.com/BurntSushi/ripgrep -u flags will search binary files. -uu is equivalent to grep -r, and -uuu is equivalent to grep -a -r. + Note that the -u flags are convenient aliases for other combinations of + flags. -u aliases '--no-ignore'. -uu aliases '--no-ignore --hidden'. + -uuu aliases '--no-ignore --hidden --text'. + -v, --invert-match : Invert matching. -- cgit v1.2.3