summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorVasco Almeida <vascomalmeida@sapo.pt>2016-06-17 20:21:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-06-17 22:46:10 (GMT)
commitc8bb9d2e5a0926c29849091b86fa025da87b68f3 (patch)
treec4c185ef5d53b3e1d79cd74d2b2501f7c30c6e27 /builtin/merge.c
parentbef4830e88008adf488d190c742e243cacc46e16 (diff)
downloadgit-c8bb9d2e5a0926c29849091b86fa025da87b68f3.zip
git-c8bb9d2e5a0926c29849091b86fa025da87b68f3.tar.gz
git-c8bb9d2e5a0926c29849091b86fa025da87b68f3.tar.bz2
i18n: merge: change command option help to lowercase
Change command option description to lowercase, matching pull counterpart option. Translators would have to translate such message only once. Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
-rw-r--r--builtin/merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c
index 961def5..d82f6c1 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -211,7 +211,7 @@ static struct option builtin_merge_options[] = {
PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, FF_ONLY },
OPT_RERERE_AUTOUPDATE(&allow_rerere_auto),
OPT_BOOL(0, "verify-signatures", &verify_signatures,
- N_("Verify that the named commit has a valid GPG signature")),
+ N_("verify that the named commit has a valid GPG signature")),
OPT_CALLBACK('s', "strategy", &use_strategies, N_("strategy"),
N_("merge strategy to use"), option_parse_strategy),
OPT_CALLBACK('X', "strategy-option", &xopts, N_("option=value"),