Replace filepattern with pathspec for consistency

pathspec is the most widely used term, and is the one defined in
gitglossary.txt. <filepattern> was used only in the synopsys for git-add
and git-commit, and in git-add.txt. Get rid of it.

This patch is obtained with by running:

perl -pi -e 's/filepattern/pathspec/' `git grep -l filepattern`

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index fd9e36b99f5506964ac8352b82bb7af05551a523..d0cdb07844b8361debc1565f11b11b813fe81c57 100644 (file)
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -11,7 +11,7 @@ SYNOPSIS
 'git add' [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p]
          [--edit | -e] [--all | [--update | -u]] [--intent-to-add | -N]
          [--refresh] [--ignore-errors] [--ignore-missing] [--]
 'git add' [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p]
          [--edit | -e] [--all | [--update | -u]] [--intent-to-add | -N]
          [--refresh] [--ignore-errors] [--ignore-missing] [--]

-         [<filepattern>...]
+         [<pathspec>...]

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------


@@ -49,7 +49,7 @@ commit.
 
 OPTIONS
 -------
 
 OPTIONS
 -------

-<filepattern>...::
+<pathspec>...::

        Files to add content from.  Fileglobs (e.g. `*.c`) can
        be given to add all matching files.  Also a
        leading directory name (e.g. `dir` to add `dir/file1`
        Files to add content from.  Fileglobs (e.g. `*.c`) can
        be given to add all matching files.  Also a
        leading directory name (e.g. `dir` to add `dir/file1`


@@ -100,20 +100,20 @@ apply to the index. See EDITING PATCHES below.
 
 -u::
 --update::
 
 -u::
 --update::

-       Only match <filepattern> against already tracked files in
+       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.
 +
        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.
 +

-If no <filepattern> is given, default to "."; in other words,
+If no <pathspec> is given, default to "."; in other words,

 update all tracked files in the current directory and its
 subdirectories.
 
 -A::
 --all::
 update all tracked files in the current directory and its
 subdirectories.
 
 -A::
 --all::

-       Like `-u`, but match <filepattern> against files in the
+       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.
        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.

diff --git a/builtin/add.c b/builtin/add.c
index e664100c7122d6c4116763716c2260756feffac2..632594768d9ee7d723a35377ab4cff9cf714a0d9 100644 (file)
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -16,7 +16,7 @@
 #include "bulk-checkin.h"
 
 static const char * const builtin_add_usage[] = {
 #include "bulk-checkin.h"
 
 static const char * const builtin_add_usage[] = {

-       N_("git add [options] [--] <filepattern>..."),
+       N_("git add [options] [--] <pathspec>..."),

        NULL
 };
 static int patch_interactive, add_interactive, edit_interactive;
        NULL
 };
 static int patch_interactive, add_interactive, edit_interactive;

diff --git a/builtin/commit.c b/builtin/commit.c
index d6dd3df8b1e1f449e7781bdb033f5cfa11753436..96684108e7437537536c42fafa7a84ddef848520 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -31,12 +31,12 @@
 #include "sequencer.h"
 
 static const char * const builtin_commit_usage[] = {
 #include "sequencer.h"
 
 static const char * const builtin_commit_usage[] = {

-       N_("git commit [options] [--] <filepattern>..."),
+       N_("git commit [options] [--] <pathspec>..."),

        NULL
 };
 
 static const char * const builtin_status_usage[] = {
        NULL
 };
 
 static const char * const builtin_status_usage[] = {

-       N_("git status [options] [--] <filepattern>..."),
+       N_("git status [options] [--] <pathspec>..."),

        NULL
 };
 
        NULL
 };