aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/gitignore.txt
diff options
context:
space:
mode:
authorMartin Ågren <martin.agren@gmail.com>2021-10-24 19:09:16 +0200
committerJunio C Hamano <gitster@pobox.com>2021-10-25 11:06:56 -0700
commitc314b62553e2abf9055aa58d5e4ed2e5bb8c9f64 (patch)
treecf6f9ff4d2e2005a841521c807e17eee37ca7cb7 /Documentation/gitignore.txt
parent85bc0065612d83f6297d24f0cf62b2e2a0f33d25 (diff)
downloadgit-c314b62553e2abf9055aa58d5e4ed2e5bb8c9f64.tar.gz
gitignore.txt: change "folder" to "directory"
We prefer "directory" over "folder" when discussing the file system concept. Change this instance for consistency -- indeed, even within this paragraph, we already use "directory". Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/gitignore.txt')
-rw-r--r--Documentation/gitignore.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index f8a1fc2014..f2738b10db 100644
--- a/Documentation/gitignore.txt
+++ b/Documentation/gitignore.txt
@@ -155,7 +155,7 @@ accessed from the index or a tree versus from the filesystem.
EXAMPLES
--------
- - The pattern `hello.*` matches any file or folder
+ - The pattern `hello.*` matches any file or directory
whose name begins with `hello.`. If one wants to restrict
this only to the directory and not in its subdirectories,
one can prepend the pattern with a slash, i.e. `/hello.*`;