From: SZEDER Gábor Date: Sat, 14 Jun 2008 09:48:00 +0000 (+0200) Subject: git add: add long equivalents of '-u' and '-f' options X-Git-Tag: v1.5.6-rc3~8 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=69c61c4fa9a4b38eeb611a86102493394cdeb9cf;p=git.git git add: add long equivalents of '-u' and '-f' options The option -u stands for --update and it is a good idea to make it clear especially because this is the only mode of operation of "git add" that does something different from "adding". Give longer --force synonym to -f while we are at it as well. Signed-off-by: SZEDER Gábor Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index 9c6b081e6..b8e3fa675 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -8,8 +8,9 @@ git-add - Add file contents to the index SYNOPSIS -------- [verse] -'git-add' [-n] [-v] [-f] [--interactive | -i] [--patch | -p] [-u] [--refresh] - [--ignore-errors] [--] ... +'git-add' [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p] + [--update | -u] [--refresh] [--ignore-errors] [--] + ... DESCRIPTION ----------- @@ -59,6 +60,7 @@ OPTIONS Be verbose. -f:: +--force:: Allow adding otherwise ignored files. -i:: @@ -75,6 +77,7 @@ OPTIONS the specified filepatterns before exiting. -u:: +--update:: Update only files that git already knows about, staging modified content for commit and marking deleted files for removal. This is similar diff --git a/builtin-add.c b/builtin-add.c index 1da22eec9..9930cf53f 100644 --- a/builtin-add.c +++ b/builtin-add.c @@ -200,8 +200,8 @@ static struct option builtin_add_options[] = { OPT_GROUP(""), OPT_BOOLEAN('i', "interactive", &add_interactive, "interactive picking"), OPT_BOOLEAN('p', "patch", &patch_interactive, "interactive patching"), - OPT_BOOLEAN('f', NULL, &ignored_too, "allow adding otherwise ignored files"), - OPT_BOOLEAN('u', NULL, &take_worktree_changes, "update tracked files"), + OPT_BOOLEAN('f', "force", &ignored_too, "allow adding otherwise ignored files"), + OPT_BOOLEAN('u', "update", &take_worktree_changes, "update tracked 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_END(),