diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-05-13 19:19:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-13 19:19:19 (GMT) |
| commit | 658624209a40ffae38ae4ea4d62e8fe3b891d5fd (patch) | |
| tree | 73a983bc2d74c3d24e2d4439ef37710ec900283f /Documentation | |
| parent | 3af459e48dd275665568f3a7a6d76d90c1843e6a (diff) | |
| parent | 60e523632ff7b045a75ed40d8eac26220051ffab (diff) | |
| download | git-658624209a40ffae38ae4ea4d62e8fe3b891d5fd.zip git-658624209a40ffae38ae4ea4d62e8fe3b891d5fd.tar.gz git-658624209a40ffae38ae4ea4d62e8fe3b891d5fd.tar.bz2 | |
Merge branch 'ss/faq-ignore'
Random bits of FAQ.
* ss/faq-ignore:
gitfaq: files in .gitignore are tracked
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/gitfaq.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/gitfaq.txt b/Documentation/gitfaq.txt index 1cf83df..11d9bac 100644 --- a/Documentation/gitfaq.txt +++ b/Documentation/gitfaq.txt @@ -223,6 +223,16 @@ a file checked into the repository which is a template or set of defaults which can then be copied alongside and modified as appropriate. This second, modified file is usually ignored to prevent accidentally committing it. +[[files-in-.gitignore-are-tracked]] +I asked Git to ignore various files, yet they are still tracked:: + A `gitignore` file ensures that certain file(s) which are not + tracked by Git remain untracked. However, sometimes particular + file(s) may have been tracked before adding them into the + `.gitignore`, hence they still remain tracked. To untrack and + ignore files/patterns, use `git rm --cached <file/pattern>` + and add a pattern to `.gitignore` that matches the <file>. + See linkgit:gitignore[5] for details. + Hooks ----- |