From d1d028ea16af27158f5d77154cfa60dbd9143314 Mon Sep 17 00:00:00 2001 From: Brian Downing Date: Thu, 16 Aug 2007 17:56:08 -0500 Subject: Clarify actual behavior of 'git add' and ignored files Signed-off-by: Brian Downing Signed-off-by: Junio C Hamano --- Documentation/git-add.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'Documentation') diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index dee38f8250..3383aca9af 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. -- cgit v1.2.3