Merge branch 'maint'

* maint:
  Replace filepattern with pathspec for consistency

diff --cc Documentation/git-add.txt
index 5333559,d0cdb07..d980e2c
--- 1/Documentation/git-add.txt
--- 2/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::

diff --cc builtin/add.c
Simple merge

diff --cc builtin/commit.c
Simple merge