summaryrefslogtreecommitdiff
path: root/builtin-add.c
diff options
context:
space:
mode:
authorSZEDER Gábor <szeder@ira.uka.de>2008-06-14 11:48:00 +0200
committerJunio C Hamano <gitster@pobox.com>2008-06-14 12:47:31 -0700
commit69c61c4fa9a4b38eeb611a86102493394cdeb9cf (patch)
tree7f490ea6d59e2ab94f14d4475979f438da4e2929 /builtin-add.c
parentb994ec142f296c7118823495764151c2a6227e1a (diff)
downloadgit-69c61c4fa9a4b38eeb611a86102493394cdeb9cf.tar.gz
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>
Diffstat (limited to 'builtin-add.c')
-rw-r--r--builtin-add.c4
1 files changed, 2 insertions, 2 deletions
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(),