summaryrefslogtreecommitdiffstats
path: root/git-add.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-03-11 13:54:25 -0700
committerJunio C Hamano <gitster@pobox.com>2013-03-11 13:54:25 -0700
commitf66c463acc5e9564f9a8634aef4c19c0c0b34872 (patch)
tree3ed05e95b6b8a2bc52e162247d7dc56e8ad78b4c /git-add.txt
parent6cfebd0c38be9afef7a8581dd678ebae08caaa59 (diff)
downloadgit-htmldocs-f66c463acc5e9564f9a8634aef4c19c0c0b34872.tar.gz
Autogenerated HTML docs for v1.8.2-rc3-16-gce432
Diffstat (limited to 'git-add.txt')
-rw-r--r--git-add.txt22
1 files changed, 12 insertions, 10 deletions
diff --git a/git-add.txt b/git-add.txt
index 388a2254f..b0944e57d 100644
--- a/git-add.txt
+++ b/git-add.txt
@@ -100,12 +100,9 @@ apply to the index. See EDITING PATCHES below.
-u::
--update::
- Only match <pathspec> against already tracked files in
- the index rather than the working tree. That means that it
- will never stage new files, but that it will stage modified
- new contents of tracked files and that it will remove files
- from the index if the corresponding files in the working tree
- have been removed.
+ Update the index just where it already has an entry matching
+ <pathspec>. This removes as well as modifies index entries to
+ match the working tree, but adds no new files.
+
If no <pathspec> is given, the current version of Git defaults to
"."; in other words, update all tracked files in the current directory
@@ -114,10 +111,15 @@ of Git, hence the form without <pathspec> should not be used.
-A::
--all::
- Like `-u`, but match <pathspec> against files in the
- working tree in addition to the index. That means that it
- will find new files as well as staging modified content and
- removing files that are no longer in the working tree.
+ Update the index not only where the working tree has a file
+ matching <pathspec> but also where the index already has an
+ entry. This adds, modifies, and removes index entries to
+ match the working tree.
++
+If no <pathspec> is given, the current version of Git defaults to
+"."; in other words, update all files in the current directory
+and its subdirectories. This default will change in a future version
+of Git, hence the form without <pathspec> should not be used.
-N::
--intent-to-add::