diff options
| author |  Jiang Xin <worldhello.net@gmail.com> | 2015-08-26 23:51:19 +0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-08-26 12:51:43 -0700 |
| commit | 1fb5a0ea96435e0bf4459fe5987df4c6b8a2fc76 (patch) | |
| tree | 7f102ed805907173c6f1f8d5a19ebc2b6a2d5ccb /builtin | |
| parent | git-am: add am.threeWay config variable (diff) | |
| download | tgif-1fb5a0ea96435e0bf4459fe5987df4c6b8a2fc76.tar.xz | |
i18n: am: fix typo in description of -b option
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -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 1399c8dd88..473d794fc5 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -2143,7 +2143,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")), |