X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin%2Fcheckout-index.c;h=1ee30443074bbae67a402c5397b939a716f2a191;hb=b361888dd5a26c4f1eb6268392e89e2d546accf6;hp=65cbee0552b8e2d5ed7cfd57781031d72c1cdd98;hpb=10793e6957d3400641a908236e93c09d2a1d81c4;p=git.git

diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c
index 65cbee055..1ee304430 100644
--- a/builtin/checkout-index.c
+++ b/builtin/checkout-index.c
@@ -217,9 +217,9 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
 	struct option builtin_checkout_index_options[] = {
 		OPT_BOOLEAN('a', "all", &all,
 			"checks out all files in the index"),
-		OPT_BOOLEAN('f', "force", &force,
-			"forces overwrite of existing files"),
-		OPT__QUIET(&quiet),
+		OPT__FORCE(&force, "forces overwrite of existing files"),
+		OPT__QUIET(&quiet,
+			"no warning for existing files and files not in index"),
 		OPT_BOOLEAN('n', "no-create", &not_new,
 			"don't checkout new files"),
 		{ OPTION_CALLBACK, 'u', "index", &newfd, NULL,