From 9f60f49b9222f9200e688a64cd80610305b03cc5 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 22 Apr 2013 13:29:20 -0700 Subject: 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 --- Documentation/git-add.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'Documentation/git-add.txt') 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] [--] - [...] + [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]] + [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] + [--] [...] DESCRIPTION ----------- @@ -111,6 +111,7 @@ of Git, hence the form without should not be used. -A:: --all:: +--no-ignore-removal:: Update the index not only where the working tree has a file matching 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 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 should not be used. This option is primarily to help the current users of Git, whose "git add ..." ignores removed files. In future versions of Git, "git add ..." will be a synonym to "git add -A -..." and "git add --no-all ..." will behave like +..." and "git add --ignore-removal ..." will behave like today's "git add ...", ignoring removed files. -N:: -- cgit v1.2.1