diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-03-07 15:14:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-07 15:14:47 -0800 |
| commit | 160c4b183c6fe87417e1beb9a97949567bb3988a (patch) | |
| tree | ad839883017fd060722aef6a80cf73681782c7ac /Documentation/git-add.txt | |
| parent | Merge branch 'jn/add-2.0-u-A-sans-pathspec' (diff) | |
| parent | git add <pathspec>... defaults to "-A" (diff) | |
| download | tgif-160c4b183c6fe87417e1beb9a97949567bb3988a.tar.xz | |
Merge branch 'jc/add-2.0-ignore-removal'
"git add <pathspec>" is the same as "git add -A <pathspec>" now,
i.e. it does not ignore removals from the directory specified.
Diffstat (limited to 'Documentation/git-add.txt')
| -rw-r--r-- | Documentation/git-add.txt | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index c7f83fd696..895922e27c 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -53,8 +53,14 @@ OPTIONS 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` - and `dir/file2`) can be given to add all files in the - directory, recursively. + and `dir/file2`) can be given to update the index to + match the current state of the directory as a whole (e.g. + specifying `dir` will record not just a file `dir/file1` + modified in the working tree, a file `dir/file2` added to + the working tree, but also a file `dir/file3` removed from + the working tree. Note that older versions of Git used + to ignore removed files; use `--no-all` option if you want + to add modified or new files but ignore removed ones. -n:: --dry-run:: @@ -129,11 +135,9 @@ subdirectories). files that have been removed from the working tree. This option is a no-op when no <pathspec> is used. + -This option is primarily to help the current users of Git, whose -"git add <pathspec>..." ignores removed files. In future versions -of Git, "git add <pathspec>..." will be a synonym to "git add -A -<pathspec>..." and "git add --ignore-removal <pathspec>..." will behave like -today's "git add <pathspec>...", ignoring removed files. +This option is primarily to help users who are used to older +versions of Git, whose "git add <pathspec>..." was a synonym +for "git add --no-all <pathspec>...", i.e. ignored removed files. -N:: --intent-to-add:: |