From: Brian Downing <bdowning@lavos.net>
Date: Thu, 16 Aug 2007 22:56:08 +0000 (-0500)
Subject: Clarify actual behavior of 'git add' and ignored files
X-Git-Tag: v1.5.3-rc6~30
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d1d028ea16af27158f5d77154cfa60dbd9143314;p=git.git

Clarify actual behavior of 'git add' and ignored files

Signed-off-by: Brian Downing <bdowning@lavos.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index dee38f825..3383aca9a 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -28,10 +28,12 @@ you must run 'git add' again to add the new content to the index.
 The 'git status' command can be used to obtain a summary of which
 files have changes that are staged for the next commit.
 
-The 'add' command can be used to add ignored files with `-f` (force)
-option, but they have to be explicitly and exactly specified from the
-command line.  File globbing and recursive behaviour do not add ignored
-files.
+The 'git add' command will not add ignored files by default.  If any
+ignored files were explicitly specified on the command line, 'git add'
+will fail with a list of ignored files.  Ignored files reached by
+directory recursion or filename globbing will be silently ignored.
+The 'add' command can be used to add ignored files with the `-f`
+(force) option.
 
 Please see gitlink:git-commit[1] for alternative ways to add content to a
 commit.