From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 12 Feb 2013 20:23:12 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Url: https://repo.or.cz/w/git/mingw.git/commitdiff_plain/5bf72ed2e7ef82d5ef7a35c978dc72576fdb0efc

Merge branch 'maint'

* maint:
  Replace filepattern with pathspec for consistency
---

5bf72ed2e7ef82d5ef7a35c978dc72576fdb0efc
diff --cc Documentation/git-add.txt
index 533355984c,d0cdb07844..d980e2cb7d
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@@ -107,10 -107,9 +107,10 @@@ apply to the index. See EDITING PATCHE
  	from the index if the corresponding files in the working tree
  	have been removed.
  +
- If no <filepattern> is given, the current version of Git defaults to
 -If no <pathspec> is given, default to "."; in other words,
 -update all tracked files in the current directory and its
 -subdirectories.
++If no <pathspec> 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::