summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-07-19 18:09:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-07-19 18:09:38 (GMT)
commit8fbe9b32ce6f5e12ba3f8b9d4e3ccb0b8acf529f (patch)
treedbca21bec678543260588cc3e04cfcacfd8d9ac5 /Documentation
parent8ac3a66702c43386eb580b7a1a8b1a31cd675327 (diff)
parent108da0db1277fc2f4820d0a47c02b2c63111f7a5 (diff)
downloadgit-8fbe9b32ce6f5e12ba3f8b9d4e3ccb0b8acf529f.zip
git-8fbe9b32ce6f5e12ba3f8b9d4e3ccb0b8acf529f.tar.gz
git-8fbe9b32ce6f5e12ba3f8b9d4e3ccb0b8acf529f.tar.bz2
Merge branch 'jl/add-n-ignore-missing'
* jl/add-n-ignore-missing: git add: Add the "--ignore-missing" option for the dry run
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-add.txt9
1 files changed, 8 insertions, 1 deletions
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 74741a4..bfea2c2 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -57,7 +57,8 @@ OPTIONS
-n::
--dry-run::
- Don't actually add the file(s), just show if they exist.
+ Don't actually add the file(s), just show if they exist and/or will
+ be ignored.
-v::
--verbose::
@@ -131,6 +132,12 @@ subdirectories.
them, do not abort the operation, but continue adding the
others. The command shall still exit with non-zero status.
+--ignore-missing::
+ This option can only be used together with --dry-run. By using
+ this option the user can check if any of the given files would
+ be ignored, no matter if they are already present in the work
+ tree or not.
+
\--::
This option can be used to separate command-line options from
the list of files, (useful when filenames might be mistaken