From 17dcc2bf51810032f07f060f7a6a43e43d42bb82 Mon Sep 17 00:00:00 2001 From: Andrew Gallant Date: Fri, 8 May 2020 08:21:05 -0400 Subject: [PATCH] doc: clarify that *files* override gitignores This attempts to fix some mild confusion that came up as part of #1574. Specifically: https://github.com/BurntSushi/ripgrep/issues/1574#issuecomment-625780436 --- crates/core/app.rs | 4 ++-- doc/rg.1.txt.tpl | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/crates/core/app.rs b/crates/core/app.rs index 5aa5760e..72c37837 100644 --- a/crates/core/app.rs +++ b/crates/core/app.rs @@ -693,8 +693,8 @@ fn arg_path(args: &mut Vec) { const SHORT: &str = "A file or directory to search."; const LONG: &str = long!( "\ -A file or directory to search. Directories are searched recursively. Paths \ -specified on the command line override glob and ignore rules. \ +A file or directory to search. Directories are searched recursively. File \ +paths specified on the command line override glob and ignore rules. \ " ); let arg = RGArg::positional("path", "PATH") diff --git a/doc/rg.1.txt.tpl b/doc/rg.1.txt.tpl index 2ba38dca..c0d1bad7 100644 --- a/doc/rg.1.txt.tpl +++ b/doc/rg.1.txt.tpl @@ -75,8 +75,9 @@ _PATTERN_:: dash, use the -e/--regexp option. _PATH_:: - A file or directory to search. Directories are searched recursively. Paths - specified explicitly on the command line override glob and ignore rules. + A file or directory to search. Directories are searched recursively. File + paths specified explicitly on the command line override glob and ignore + rules. OPTIONS