Skip to content

Commit

Permalink
doc: clarify that *files* override gitignores
Browse files Browse the repository at this point in the history
This attempts to fix some mild confusion that came up as part of #1574.
Specifically:
#1574 (comment)
  • Loading branch information
BurntSushi committed May 9, 2020
1 parent 9a858e4 commit 17dcc2b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions crates/core/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -693,8 +693,8 @@ fn arg_path(args: &mut Vec<RGArg>) {
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")
Expand Down
5 changes: 3 additions & 2 deletions doc/rg.1.txt.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 17dcc2b

Please sign in to comment.