diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-27 01:45:33 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-27 01:45:33 +0300 |
| commit | 74702c382597ce34e7ce884e29d23e1eedb52196 (patch) | |
| tree | 7eb3d572af32c7ef2f42fd4b9a8bb817c7c2c429 /builtin/am.c | |
| parent | b7d2a15b9f5cdbed7e8dbcc3fff0ea1ae92ed764 (diff) | |
| parent | 1fb5a0ea96435e0bf4459fe5987df4c6b8a2fc76 (diff) | |
Merge branch 'pt/am-builtin'
Rewrite "am" in "C".
* pt/am-builtin:
i18n: am: fix typo in description of -b option
Diffstat (limited to 'builtin/am.c')
| -rw-r--r-- | builtin/am.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/am.c b/builtin/am.c index 5d34696097..142f8840bd 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")), |