diff options
| author |  SZEDER Gábor <szeder@ira.uka.de> | 2008-06-14 11:48:00 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-06-14 12:47:31 -0700 |
| commit | 69c61c4fa9a4b38eeb611a86102493394cdeb9cf (patch) | |
| tree | 7f490ea6d59e2ab94f14d4475979f438da4e2929 | |
| parent | Merge branch 'rs/attr' (diff) | |
| download | tgif-69c61c4fa9a4b38eeb611a86102493394cdeb9cf.tar.xz | |
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 <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-add.txt | 7 | ||||
| -rw-r--r-- | builtin-add.c | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index 9c6b081e6c..b8e3fa6759 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] [--] <filepattern>... +'git-add' [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p] + [--update | -u] [--refresh] [--ignore-errors] [--] + <filepattern>... 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 1da22eec91..9930cf53f5 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(), |