From: Martin Ågren Date: Sun, 24 Oct 2021 17:09:16 +0000 (+0200) Subject: gitignore.txt: change "folder" to "directory" X-Git-Tag: v2.34.0-rc0~7^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c314b62553e2abf9055aa58d5e4ed2e5bb8c9f64;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- 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.*`;