mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'maint'
* maint: Replace filepattern with pathspec for consistency
This commit is contained in:
commit
5bf72ed2e7
|
@ -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,21 +100,21 @@ 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, the current version of Git defaults to
|
||||
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::
|
||||
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.
|
||||
|
|
|
@ -17,7 +17,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;
|
||||
|
|
|
@ -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
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue