summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-02-04 10:25:13 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-02-04 10:25:14 -0800
commit27d46a70724ef5e087863c3db35eb7ca9c084c2c (patch)
treec5d5c9a2ba819662fb939bfb8ff195f718749950 /Documentation
parentMerge branch 'jc/push-reject-reasons' (diff)
parentadd: warn when -u or -A is used without pathspec (diff)
downloadtgif-27d46a70724ef5e087863c3db35eb7ca9c084c2c.tar.xz
Merge branch 'mm/add-u-A-sans-pathspec'
Forbid "git add -u" and "git add -A" without pathspec run from a subdirectory, to train people to type "." (or ":/") to make the choice of default does not matter. * mm/add-u-A-sans-pathspec: add: warn when -u or -A is used without pathspec
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-add.txt7
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index fd9e36b99f..533355984c 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -107,9 +107,10 @@ apply to the index. See EDITING PATCHES below.
from the index if the corresponding files in the working tree
have been removed.
+
-If no <filepattern> is given, default to "."; in other words,
-update all tracked files in the current directory and its
-subdirectories.
+If no <filepattern> is given, the current version of Git defaults to
+"."; in other words, update all tracked files in the current directory
+and its subdirectories. This default will change in a future version
+of Git, hence the form without <filepattern> should not be used.
-A::
--all::