about summary refs log tree commit diff
path: root/third_party/git/Documentation/git-check-ignore.txt
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
committerVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
commit93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch)
tree85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/Documentation/git-check-ignore.txt
parent6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff)
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable.

This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing
changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/Documentation/git-check-ignore.txt')
-rw-r--r--third_party/git/Documentation/git-check-ignore.txt14
1 files changed, 4 insertions, 10 deletions
diff --git a/third_party/git/Documentation/git-check-ignore.txt b/third_party/git/Documentation/git-check-ignore.txt
index 0c3924a63d2f..8b42cb3fb20a 100644
--- a/third_party/git/Documentation/git-check-ignore.txt
+++ b/third_party/git/Documentation/git-check-ignore.txt
@@ -30,22 +30,16 @@ OPTIONS
 	valid with a single pathname.
 
 -v, --verbose::
-	Instead of printing the paths that are excluded, for each path
-	that matches an exclude pattern, print the exclude pattern
-	together with the path.  (Matching an exclude pattern usually
-	means the path is excluded, but if the pattern begins with '!'
-	then it is a negated pattern and matching it means the path is
-	NOT excluded.)
-+
-For precedence rules within and between exclude sources, see
-linkgit:gitignore[5].
+	Also output details about the matching pattern (if any)
+	for each given pathname. For precedence rules within and
+	between exclude sources, see linkgit:gitignore[5].
 
 --stdin::
 	Read pathnames from the standard input, one per line,
 	instead of from the command-line.
 
 -z::
-	The output format is modified to be machine-parsable (see
+	The output format is modified to be machine-parseable (see
 	below).  If `--stdin` is also given, input paths are separated
 	with a NUL character instead of a linefeed character.