提交 d32805dc 编写于 作者: M Matthieu Moy 提交者: Junio C Hamano

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: NMatthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 901fd180
...@@ -11,7 +11,7 @@ SYNOPSIS ...@@ -11,7 +11,7 @@ SYNOPSIS
'git add' [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p] 'git add' [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p]
[--edit | -e] [--all | [--update | -u]] [--intent-to-add | -N] [--edit | -e] [--all | [--update | -u]] [--intent-to-add | -N]
[--refresh] [--ignore-errors] [--ignore-missing] [--] [--refresh] [--ignore-errors] [--ignore-missing] [--]
[<filepattern>...] [<pathspec>...]
DESCRIPTION DESCRIPTION
----------- -----------
...@@ -49,7 +49,7 @@ commit. ...@@ -49,7 +49,7 @@ commit.
OPTIONS OPTIONS
------- -------
<filepattern>...:: <pathspec>...::
Files to add content from. Fileglobs (e.g. `*.c`) can Files to add content from. Fileglobs (e.g. `*.c`) can
be given to add all matching files. Also a be given to add all matching files. Also a
leading directory name (e.g. `dir` to add `dir/file1` leading directory name (e.g. `dir` to add `dir/file1`
...@@ -100,20 +100,20 @@ apply to the index. See EDITING PATCHES below. ...@@ -100,20 +100,20 @@ apply to the index. See EDITING PATCHES below.
-u:: -u::
--update:: --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 the index rather than the working tree. That means that it
will never stage new files, but that it will stage modified will never stage new files, but that it will stage modified
new contents of tracked files and that it will remove files new contents of tracked files and that it will remove files
from the index if the corresponding files in the working tree from the index if the corresponding files in the working tree
have been removed. 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 update all tracked files in the current directory and its
subdirectories. subdirectories.
-A:: -A::
--all:: --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 working tree in addition to the index. That means that it
will find new files as well as staging modified content and will find new files as well as staging modified content and
removing files that are no longer in the working tree. removing files that are no longer in the working tree.
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include "bulk-checkin.h" #include "bulk-checkin.h"
static const char * const builtin_add_usage[] = { static const char * const builtin_add_usage[] = {
N_("git add [options] [--] <filepattern>..."), N_("git add [options] [--] <pathspec>..."),
NULL NULL
}; };
static int patch_interactive, add_interactive, edit_interactive; static int patch_interactive, add_interactive, edit_interactive;
......
...@@ -31,12 +31,12 @@ ...@@ -31,12 +31,12 @@
#include "sequencer.h" #include "sequencer.h"
static const char * const builtin_commit_usage[] = { static const char * const builtin_commit_usage[] = {
N_("git commit [options] [--] <filepattern>..."), N_("git commit [options] [--] <pathspec>..."),
NULL NULL
}; };
static const char * const builtin_status_usage[] = { static const char * const builtin_status_usage[] = {
N_("git status [options] [--] <filepattern>..."), N_("git status [options] [--] <pathspec>..."),
NULL NULL
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册