summaryrefslogtreecommitdiff
path: root/Documentation/git-add.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-22 20:29:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-04-22 20:34:31 (GMT)
commit9f60f49b9222f9200e688a64cd80610305b03cc5 (patch)
treed5d2b9bac38a600d2312b6e35c0e9dde35540855 /Documentation/git-add.txt
parent118f60ee06612083ff4f1810424e80a3e896f73e (diff)
downloadgit-9f60f49b9222f9200e688a64cd80610305b03cc5.zip
git-9f60f49b9222f9200e688a64cd80610305b03cc5.tar.gz
git-9f60f49b9222f9200e688a64cd80610305b03cc5.tar.bz2
git add: --ignore-removal is a better named --no-all
In the historical context of "git add --all ." that pays attention to "all kinds of changes" (implying "without ignoring removals"), the option to countermand it "--no-all" may have made sense, but because we will be making "--all" the default when a pathspec is given, it makes more sense to rename the option to a more explicit "--ignore-removal". The "--all" option naturally becomes its negation, "--no-ignore-removal". Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-add.txt')
-rw-r--r--Documentation/git-add.txt10
1 files changed, 6 insertions, 4 deletions
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 5c501a2..48754cb 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::