X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgitignore.txt;h=59321a2e82b1e141746d94c439452b52b84994ad;hb=3fcee259d023087184c63eedf1015be6e23ea6e1;hp=fc0efd8ec8dcc791c528d0eca362172f7e445164;hpb=547905f8cd2a04b3e1117f00025b60f81aa60f47;p=git.git

diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index fc0efd8ec..59321a2e8 100644
--- a/Documentation/gitignore.txt
+++ b/Documentation/gitignore.txt
@@ -13,9 +13,14 @@ DESCRIPTION
 -----------
 
 A `gitignore` file specifies intentionally untracked files that
-git should ignore.  Each line in a `gitignore` file specifies a
-pattern.
-
+git should ignore.
+Note that all the `gitignore` files really concern only files
+that are not already tracked by git;
+in order to ignore uncommitted changes in already tracked files,
+please refer to the 'git update-index --assume-unchanged'
+documentation.
+
+Each line in a `gitignore` file specifies a pattern.
 When deciding whether to ignore a path, git normally checks
 `gitignore` patterns from multiple sources, with the following
 order of precedence, from highest to lowest (within one level of