aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-25 17:46:38 -0800
committerJunio C Hamano <junkio@cox.net>2006-12-25 17:46:38 -0800
commit6a1ad32519898a8fa4400e081c2d61fd3af42e2c (patch)
tree110f00c9884d8e4bf8b6cb6bc15fbc40db46782c /Documentation
parent1e423f56558e74a3a94c653108f64f0305199b9a (diff)
downloadgit-6a1ad32519898a8fa4400e081c2d61fd3af42e2c.tar.gz
git-6a1ad32519898a8fa4400e081c2d61fd3af42e2c.tar.xz
git-add -f: allow adding otherwise ignored files.
Instead of just warning, refuse to add otherwise ignored files by default, and allow it with an -f option. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-add.txt8
1 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 2fef0681b..95bea6637 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -7,7 +7,7 @@ git-add - Add file contents to the changeset to be committed next
SYNOPSIS
--------
-'git-add' [-n] [-v] [--interactive] [--] <file>...
+'git-add' [-n] [-v] [-f] [--interactive] [--] <file>...
DESCRIPTION
-----------
@@ -25,7 +25,8 @@ the commit.
The 'git status' command can be used to obtain a summary of what is included
for the next commit.
-This command can be used to add ignored files, but they have to be
+This 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.
@@ -48,6 +49,9 @@ OPTIONS
-v::
Be verbose.
+-f::
+ Allow adding otherwise ignored files.
+
\--interactive::
Add modified contents in the working tree interactively to
the index.