summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-05-10 10:23:29 -0700
committerJunio C Hamano <gitster@pobox.com>2023-05-10 10:23:29 -0700
commitf7947450de7ee70019290f702c3f3f2e9a16ffaa (patch)
treee993cb355ce21ed9109c269ffbb727acb98fdf72
parent40a5d2b79b57378cc36d43d3b30e704100dc1492 (diff)
parent0c5308af30f7f3a810aa64e74152a8df7c81e87c (diff)
downloadgit-f7947450de7ee70019290f702c3f3f2e9a16ffaa.tar.gz
Merge branch 'sd/doc-gitignore-and-rm-cached'
Doc update. * sd/doc-gitignore-and-rm-cached: docs: clarify git rm --cached function in gitignore note
-rw-r--r--Documentation/gitignore.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index f2738b10db..4c17f2356c 100644
--- a/Documentation/gitignore.txt
+++ b/Documentation/gitignore.txt
@@ -146,7 +146,9 @@ The purpose of gitignore files is to ensure that certain files
not tracked by Git remain untracked.
To stop tracking a file that is currently tracked, use
-'git rm --cached'.
+'git rm --cached' to remove the file from the index. The filename
+can then be added to the `.gitignore` file to stop the file from
+being reintroduced in later commits.
Git does not follow symbolic links when accessing a `.gitignore` file in
the working tree. This keeps behavior consistent when the file is