diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-26 15:28:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-26 15:28:09 -0700 |
| commit | 838f9c1eb69de6d98889bbdb4d66dfe37e156091 (patch) | |
| tree | 482bdef0776b9b6618557160f76a496eaa8306f1 /Documentation | |
| parent | 877ee9cc7eec7f1cf43d726f6a92c20fdfe83ca9 (diff) | |
| parent | 4c7114308ea12de7b69a3b282881398212dec8dd (diff) | |
| download | git-838f9c1eb69de6d98889bbdb4d66dfe37e156091.tar.gz | |
Merge branch 'jc/add-ignore-removal'
Introduce "--ignore-removal" as a synonym to "--no-all" for "git
add", and improve the 2.0 migration warning with it.
* jc/add-ignore-removal:
git add: rephrase -A/--no-all warning
git add: --ignore-removal is a better named --no-all
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-add.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index 5c501a299e..48754cbc67 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -9,9 +9,9 @@ SYNOPSIS -------- [verse] 'git add' [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p] - [--edit | -e] [--[no-]all | [--update | -u]] [--intent-to-add | -N] - [--refresh] [--ignore-errors] [--ignore-missing] [--] - [<pathspec>...] + [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]] + [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] + [--] [<pathspec>...] DESCRIPTION ----------- @@ -111,6 +111,7 @@ of Git, hence the form without <pathspec> should not be used. -A:: --all:: +--no-ignore-removal:: Update the index not only where the working tree has a file matching <pathspec> but also where the index already has an entry. This adds, modifies, and removes index entries to @@ -122,6 +123,7 @@ and its subdirectories. This default will change in a future version of Git, hence the form without <pathspec> should not be used. --no-all:: +--ignore-removal:: Update the index by adding new files that are unknown to the index and files modified in the working tree, but ignore files that have been removed from the working tree. This @@ -130,7 +132,7 @@ of Git, hence the form without <pathspec> should not be 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 --no-all <pathspec>..." will behave like +<pathspec>..." and "git add --ignore-removal <pathspec>..." will behave like today's "git add <pathspec>...", ignoring removed files. -N:: |