diff options
| author |  Matthieu Moy <Matthieu.Moy@imag.fr> | 2013-02-12 10:24:44 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-02-12 10:05:38 -0800 |
| commit | d32805dce7bdc45a3e4045e999fc5d56e3b46a82 (patch) | |
| tree | d0948090ec7fe05f4152a3f6c0c01c437df36bb6 | |
| parent | user-manual: Rewrite git-gc section for automatic packing (diff) | |
| download | tgif-d32805dce7bdc45a3e4045e999fc5d56e3b46a82.tar.xz | |
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>
| -rw-r--r-- | Documentation/git-add.txt | 10 | ||||
| -rw-r--r-- | builtin/add.c | 2 | ||||
| -rw-r--r-- | builtin/commit.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index fd9e36b99f..d0cdb07844 100644 --- 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] [--] - [<filepattern>...] + [<pathspec>...] DESCRIPTION ----------- @@ -49,7 +49,7 @@ commit. 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` @@ -100,20 +100,20 @@ apply to the index. See EDITING PATCHES below. -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. + -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:: - 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. diff --git a/builtin/add.c b/builtin/add.c index e664100c71..632594768d 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -16,7 +16,7 @@ #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; diff --git a/builtin/commit.c b/builtin/commit.c index d6dd3df8b1..96684108e7 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -31,12 +31,12 @@ #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[] = { - N_("git status [options] [--] <filepattern>..."), + N_("git status [options] [--] <pathspec>..."), NULL }; |