Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
i18n: merge: change command option help to lowercase
author
Vasco Almeida
<vascomalmeida@sapo.pt>
Fri, 17 Jun 2016 20:21:18 +0000
(20:21 +0000)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 17 Jun 2016 22:46:10 +0000
(15:46 -0700)
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>
builtin/merge.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
bef4830
)
diff --git
a/builtin/merge.c
b/builtin/merge.c
index 961def55bb0414d8c65deac1b8ae06c181f4a251..d82f6c19a350e72edd4dc03e30ff65d8c98d8ecb 100644
(file)
--- 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,
PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, FF_ONLY },
OPT_RERERE_AUTOUPDATE(&allow_rerere_auto),
OPT_BOOL(0, "verify-signatures", &verify_signatures,
- N_("
V
erify that the named commit has a valid GPG signature")),
+ N_("
v
erify 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"),
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"),