From: Michael J Gruber Date: Sun, 27 Feb 2011 15:50:10 +0000 (+0100) Subject: git-add: make -A description clearer vs. -u X-Git-Tag: v1.7.5-rc0~124 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6e7293e3ed0e29fd55bb2b4b1224613e4f38fed0;p=git.git git-add: make -A description clearer vs. -u Currently, it sounds as if "notice removal of files" distinguishes "-A" from "-u", and there is no mention of the worktree. But both notice the removal, and only "-A" adds changes from untracked files. Say so. Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano --- diff --git a/builtin/add.c b/builtin/add.c index 42c906ea0..5c9f4afef 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -322,7 +322,7 @@ static struct option builtin_add_options[] = { OPT__FORCE(&ignored_too, "allow adding otherwise ignored files"), OPT_BOOLEAN('u', "update", &take_worktree_changes, "update tracked files"), OPT_BOOLEAN('N', "intent-to-add", &intent_to_add, "record only the fact that the path will be added later"), - OPT_BOOLEAN('A', "all", &addremove, "add all, noticing removal of tracked files"), + OPT_BOOLEAN('A', "all", &addremove, "add changes from all tracked and untracked files"), OPT_BOOLEAN( 0 , "refresh", &refresh_only, "don't add, only refresh the index"), OPT_BOOLEAN( 0 , "ignore-errors", &ignore_add_errors, "just skip files which cannot be added because of errors"), OPT_BOOLEAN( 0 , "ignore-missing", &ignore_missing, "check if - even missing - files are ignored in dry run"),