diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-12 12:23:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-12 12:23:12 -0800 |
| commit | 5bf72ed2e7ef82d5ef7a35c978dc72576fdb0efc (patch) | |
| tree | 3d637de62931404577e0070e3bc0569da361d28e /Documentation/git-add.txt | |
| parent | aa3982890fe7506badfddf6252402a335a4d72b7 (diff) | |
| parent | d32805dce7bdc45a3e4045e999fc5d56e3b46a82 (diff) | |
| download | git-5bf72ed2e7ef82d5ef7a35c978dc72576fdb0efc.tar.gz | |
Merge branch 'maint'
* maint:
Replace filepattern with pathspec for consistency
Diffstat (limited to 'Documentation/git-add.txt')
| -rw-r--r-- | Documentation/git-add.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index 533355984c..d980e2cb7d 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,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. |