From f5411b992cb5287e35ceca724651121c0beb3995 Mon Sep 17 00:00:00 2001 From: Andrew Gallant Date: Fri, 23 Feb 2018 12:17:53 -0500 Subject: [PATCH] doc: use PATTERNFILE for -f/--file flag Fixes #832 --- doc/rg.1.txt.tpl | 2 +- src/app.rs | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/rg.1.txt.tpl b/doc/rg.1.txt.tpl index 911cba71..5af3eb29 100644 --- a/doc/rg.1.txt.tpl +++ b/doc/rg.1.txt.tpl @@ -12,7 +12,7 @@ Synopsis *rg* [_OPTIONS_] *-e* _PATTERN_... [_PATH_...] -*rg* [_OPTIONS_] *-f* _PATH_... [_PATH_...] +*rg* [_OPTIONS_] *-f* _PATTERNFILE_... [_PATH_...] *rg* [_OPTIONS_] *--files* [_PATH_...] diff --git a/src/app.rs b/src/app.rs index ef18fbe1..e54ecc16 100644 --- a/src/app.rs +++ b/src/app.rs @@ -31,7 +31,7 @@ Use -h for short descriptions and --help for more details."; const USAGE: &str = " rg [OPTIONS] PATTERN [PATH ...] - rg [OPTIONS] [-e PATTERN ...] [-f FILE ...] [PATH ...] + rg [OPTIONS] [-e PATTERN ...] [-f PATTERNFILE ...] [PATH ...] rg [OPTIONS] --files [PATH ...] rg [OPTIONS] --type-list"; @@ -823,7 +823,7 @@ input lines, and the newline is not counted as part of the pattern. A line is printed if and only if it matches at least one of the patterns. "); - let arg = RGArg::flag("file", "PATH").short("f") + let arg = RGArg::flag("file", "PATTERNFILE").short("f") .help(SHORT).long_help(LONG) .multiple() .allow_leading_hyphen(); @@ -1002,10 +1002,10 @@ fn flag_ignore_file(args: &mut Vec) { const SHORT: &str = "Specify additional ignore files."; const LONG: &str = long!("\ Specifies a path to one or more .gitignore format rules files. These patterns -are applied after the patterns found in .gitignore and .ignore are applied -and are matched relative to the current working directory. Multiple additional -ignore files can be specified by using the --ignore-file flag several times. -When specifying multiple ignore files, earlier files have lower precedence +are applied after the patterns found in .gitignore and .ignore are applied +and are matched relative to the current working directory. Multiple additional +ignore files can be specified by using the --ignore-file flag several times. +When specifying multiple ignore files, earlier files have lower precedence than later files. If you are looking for a way to include or exclude files and directories