summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-08-26 22:45:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-08-26 22:45:33 (GMT)
commit74702c382597ce34e7ce884e29d23e1eedb52196 (patch)
tree7eb3d572af32c7ef2f42fd4b9a8bb817c7c2c429
parentb7d2a15b9f5cdbed7e8dbcc3fff0ea1ae92ed764 (diff)
parent1fb5a0ea96435e0bf4459fe5987df4c6b8a2fc76 (diff)
downloadgit-74702c382597ce34e7ce884e29d23e1eedb52196.zip
git-74702c382597ce34e7ce884e29d23e1eedb52196.tar.gz
git-74702c382597ce34e7ce884e29d23e1eedb52196.tar.bz2
Merge branch 'pt/am-builtin'
Rewrite "am" in "C". * pt/am-builtin: i18n: am: fix typo in description of -b option
-rw-r--r--builtin/am.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/am.c b/builtin/am.c
index 5d34696..142f884 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -2191,7 +2191,7 @@ int cmd_am(int argc, const char **argv, const char *prefix)
OPT_BOOL('i', "interactive", &state.interactive,
N_("run interactively")),
OPT_HIDDEN_BOOL('b', "binary", &binary,
- N_("(historical option -- no-op")),
+ N_("historical option -- no-op")),
OPT_BOOL('3', "3way", &state.threeway,
N_("allow fall back on 3way merging if needed")),
OPT__QUIET(&state.quiet, N_("be quiet")),