Signed-off-by: Olaf Klischat <[email protected]>
---
Documentation/git-add.txt | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index fd9e36b..a5a1cd1 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -38,10 +38,12 @@ files have changes that are staged for the next commit.
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 performed by Git (quote your
-globs before the shell) will be silently ignored. The 'git add' command can
-be used to add ignored files with the `-f` (force) option.
+will fail with a list of ignored files unless the `-s` (silent-ignore)
+option was given. Ignored files reached by directory recursion or
+filename globbing performed by Git (quote your globs before the shell)
+will always be silently ignored. The 'git add' command can be used to
+add ignored files with the `-f` (force) option (which is mutually
+exclusive with `-s`).
Please see linkgit:git-commit[1] for alternative ways to add content to a
commit.
@@ -69,6 +71,11 @@ OPTIONS
--force::
Allow adding otherwise ignored files.
+-s::
+--silent-ignore::
+ Don't fail if ignored files were specified explicitly; ignore them
+ silently and continue.
+
-i::
--interactive::
Add modified contents in the working tree interactively to
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
