Andrew's git / gitweb.git / diff
?
Merge branch 'pt/am-builtin'
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Aug 2015 22:45:33 +0000 (15:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Aug 2015 22:45:33 +0000 (15:45 -0700)
Rewrite "am" in "C".

* pt/am-builtin:
i18n: am: fix typo in description of -b option

builtin/am.c patch | blob | history
diff --git a/builtin/am.c b/builtin/am.c
index 5d3469609795ac0ce9a718ce38250f9571bb107d..142f8840bd579c715be5666d2b20a760ee97e865 100644 (file)
--- 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")),