Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
i18n: am: fix typo in description of -b option
author
Jiang Xin
<worldhello.net@gmail.com>
Wed, 26 Aug 2015 15:51:19 +0000
(23:51 +0800)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 26 Aug 2015 19:51:43 +0000
(12:51 -0700)
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/am.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
e97a5e7
)
diff --git
a/builtin/am.c
b/builtin/am.c
index 1399c8dd880f86190534b9c9e0a5e84f48ebeceb..473d794fc5b293c885b6ebb8f3370d859776316a 100644
(file)
--- 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")),