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>
Matthieu Moy committed
Feb 12, 2013 at 10:24 UTC
d32805dce7bdc45a3e4045e999fc5d56e3b46a82
3 files changed
+8
-8
Documentation/git-add.txt
+5
-5
@@ -11,7 +11,7 @@ SYNOPSIS
11
'git add' [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p]
12
[--edit | -e] [--all | [--update | -u]] [--intent-to-add | -N]
13
[--refresh] [--ignore-errors] [--ignore-missing] [--]
14
- [<filepattern>...]
14
+ [<pathspec>...]
15
16
DESCRIPTION
17
-----------
@@ -49,7 +49,7 @@ commit.
49
50
OPTIONS
51
-------
52
-<filepattern>...::
52
+<pathspec>...::
53
Files to add content from. Fileglobs (e.g. `*.c`) can
54
be given to add all matching files. Also a
55
leading directory name (e.g. `dir` to add `dir/file1`
@@ -100,20 +100,20 @@ apply to the index. See EDITING PATCHES below.
100
101
-u::
102
--update::
103
- Only match <filepattern> against already tracked files in
103
+ Only match <pathspec> against already tracked files in
104
the index rather than the working tree. That means that it
105
will never stage new files, but that it will stage modified
106
new contents of tracked files and that it will remove files
107
from the index if the corresponding files in the working tree
108
have been removed.
109
+
110
-If no <filepattern> is given, default to "."; in other words,
110
+If no <pathspec> is given, default to "."; in other words,
111
update all tracked files in the current directory and its
112
subdirectories.
113
114
-A::
115
--all::
116
- Like `-u`, but match <filepattern> against files in the
116
+ Like `-u`, but match <pathspec> against files in the
117
working tree in addition to the index. That means that it
118
will find new files as well as staging modified content and
119
removing files that are no longer in the working tree.
builtin/add.c
+1
-1
@@ -16,7 +16,7 @@
16
#include "bulk-checkin.h"
17
18
static const char * const builtin_add_usage[] = {
19
- N_("git add [options] [--] <filepattern>..."),
19
+ N_("git add [options] [--] <pathspec>..."),
20
NULL
21
};
22
static int patch_interactive, add_interactive, edit_interactive;
builtin/commit.c
+2
-2
@@ -31,12 +31,12 @@
31
#include "sequencer.h"
32
33
static const char * const builtin_commit_usage[] = {
34
- N_("git commit [options] [--] <filepattern>..."),
34
+ N_("git commit [options] [--] <pathspec>..."),
35
NULL
36
};
37
38
static const char * const builtin_status_usage[] = {
39
- N_("git status [options] [--] <filepattern>..."),
39
+ N_("git status [options] [--] <pathspec>..."),
40
NULL
41
};
42