summaryrefslogtreecommitdiff
path: root/builtin/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-02-28 05:58:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-02-28 05:58:30 (GMT)
commitecd75ddb6f3fb7f2424d5852bcb4f50896cdcc9d (patch)
tree1ef34b2f554c37485b1f6781e43cc545b09450e2 /builtin/config.c
parentc8cdbf2badcc500ec68c506a3b4bda9b1e18995f (diff)
parent3b0d24053b50d8da76de28ea5f0d3947fa3d2194 (diff)
downloadgit-ecd75ddb6f3fb7f2424d5852bcb4f50896cdcc9d.zip
git-ecd75ddb6f3fb7f2424d5852bcb4f50896cdcc9d.tar.gz
git-ecd75ddb6f3fb7f2424d5852bcb4f50896cdcc9d.tar.bz2
Merge branch 'mg/placeholders-are-lowercase'
* mg/placeholders-are-lowercase: Make <identifier> lowercase in Documentation Make <identifier> lowercase as per CodingGuidelines Make <identifier> lowercase as per CodingGuidelines Make <identifier> lowercase as per CodingGuidelines CodingGuidelines: downcase placeholders in usage messages
Diffstat (limited to 'builtin/config.c')
-rw-r--r--builtin/config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/config.c b/builtin/config.c
index dad86fe..e27415d 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -52,7 +52,7 @@ static struct option builtin_config_options[] = {
OPT_BOOLEAN(0, "global", &use_global_config, "use global config file"),
OPT_BOOLEAN(0, "system", &use_system_config, "use system config file"),
OPT_BOOLEAN(0, "local", &use_local_config, "use repository config file"),
- OPT_STRING('f', "file", &given_config_file, "FILE", "use given config file"),
+ OPT_STRING('f', "file", &given_config_file, "file", "use given config file"),
OPT_GROUP("Action"),
OPT_BIT(0, "get", &actions, "get value: name [value-regex]", ACTION_GET),
OPT_BIT(0, "get-all", &actions, "get all values: key [value-regex]", ACTION_GET_ALL),