summaryrefslogtreecommitdiffstats
path: root/git-add.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2006-12-26 03:21:45 +0000
committerJunio C Hamano <junio@hera.kernel.org>2006-12-26 03:21:45 +0000
commit3d2adc7384e658641a74bdd5ed6069d6955ee373 (patch)
tree177f9b8aaa07f68bd1febcde458f7d23f4128e1d /git-add.txt
parent17bbacaef1ea96c94dc89492fadf5e6b5c9a65b5 (diff)
downloadgit-htmldocs-3d2adc7384e658641a74bdd5ed6069d6955ee373.tar.gz
Autogenerated HTML docs for v1.5.0-rc0
Diffstat (limited to 'git-add.txt')
-rw-r--r--git-add.txt17
1 files changed, 13 insertions, 4 deletions
diff --git a/git-add.txt b/git-add.txt
index 8710b3a75..95bea6637 100644
--- a/git-add.txt
+++ b/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,8 +25,10 @@ the commit.
The 'git status' command can be used to obtain a summary of what is included
for the next commit.
-This command only adds non-ignored files, to add ignored files use
-"git update-index --add".
+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.
Please see gitlink:git-commit[1] for alternative ways to add content to a
commit.
@@ -35,7 +37,11 @@ commit.
OPTIONS
-------
<file>...::
- Files to add content from.
+ Files to add content from. Fileglobs (e.g. `*.c`) can
+ be given to add all matching files. Also a
+ leading directory name (e.g. `dir` to add `dir/file1`
+ and `dir/file2`) can be given to add all files in the
+ directory, recursively.
-n::
Don't actually add the file(s), just show if they exist.
@@ -43,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.