* [PATCH] i18n: unmark a message in rebase.c
@ 2020-03-11 6:55 Jiang Xin
2020-03-11 16:27 ` Elijah Newren
2020-03-11 18:39 ` Junio C Hamano
0 siblings, 2 replies; 3+ messages in thread
From: Jiang Xin @ 2020-03-11 6:55 UTC (permalink / raw)
To: Junio C Hamano, Elijah Newren, Git List; +Cc: Jiang Xin
Commit v2.25.0-4-ge98c4269c8 (rebase (interactive-backend): fix handling
of commits that become empty, 2020-02-15) marked "{drop,keep,ask}" for
translation, but this message should not be changed.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
---
builtin/rebase.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index cb7aeae597..bff53d5d16 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1543,7 +1543,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
"ignoring them"),
REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN),
OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),
- OPT_CALLBACK_F(0, "empty", &options, N_("{drop,keep,ask}"),
+ OPT_CALLBACK_F(0, "empty", &options, "{drop,keep,ask}",
N_("how to handle commits that become empty"),
PARSE_OPT_NONEG, parse_opt_empty),
{ OPTION_CALLBACK, 'k', "keep-empty", &options, NULL,
--
2.26.0.rc0.1.g67b07ef6f6
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] i18n: unmark a message in rebase.c
2020-03-11 6:55 [PATCH] i18n: unmark a message in rebase.c Jiang Xin
@ 2020-03-11 16:27 ` Elijah Newren
2020-03-11 18:39 ` Junio C Hamano
1 sibling, 0 replies; 3+ messages in thread
From: Elijah Newren @ 2020-03-11 16:27 UTC (permalink / raw)
To: Jiang Xin; +Cc: Junio C Hamano, Git List
On Tue, Mar 10, 2020 at 11:55 PM Jiang Xin <worldhello.net@gmail.com> wrote:
>
> Commit v2.25.0-4-ge98c4269c8 (rebase (interactive-backend): fix handling
> of commits that become empty, 2020-02-15) marked "{drop,keep,ask}" for
> translation, but this message should not be changed.
>
> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
> ---
> builtin/rebase.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index cb7aeae597..bff53d5d16 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -1543,7 +1543,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
> "ignoring them"),
> REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN),
> OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),
> - OPT_CALLBACK_F(0, "empty", &options, N_("{drop,keep,ask}"),
> + OPT_CALLBACK_F(0, "empty", &options, "{drop,keep,ask}",
> N_("how to handle commits that become empty"),
> PARSE_OPT_NONEG, parse_opt_empty),
> { OPTION_CALLBACK, 'k', "keep-empty", &options, NULL,
> --
> 2.26.0.rc0.1.g67b07ef6f6
Thanks for the fix.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] i18n: unmark a message in rebase.c
2020-03-11 6:55 [PATCH] i18n: unmark a message in rebase.c Jiang Xin
2020-03-11 16:27 ` Elijah Newren
@ 2020-03-11 18:39 ` Junio C Hamano
1 sibling, 0 replies; 3+ messages in thread
From: Junio C Hamano @ 2020-03-11 18:39 UTC (permalink / raw)
To: Jiang Xin; +Cc: Elijah Newren, Git List
Jiang Xin <worldhello.net@gmail.com> writes:
> Commit v2.25.0-4-ge98c4269c8 (rebase (interactive-backend): fix handling
> of commits that become empty, 2020-02-15) marked "{drop,keep,ask}" for
> translation, but this message should not be changed.
Thanks.
>
> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
> ---
> builtin/rebase.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index cb7aeae597..bff53d5d16 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -1543,7 +1543,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
> "ignoring them"),
> REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN),
> OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),
> - OPT_CALLBACK_F(0, "empty", &options, N_("{drop,keep,ask}"),
> + OPT_CALLBACK_F(0, "empty", &options, "{drop,keep,ask}",
> N_("how to handle commits that become empty"),
> PARSE_OPT_NONEG, parse_opt_empty),
> { OPTION_CALLBACK, 'k', "keep-empty", &options, NULL,
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-03-11 18:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-11 6:55 [PATCH] i18n: unmark a message in rebase.c Jiang Xin
2020-03-11 16:27 ` Elijah Newren
2020-03-11 18:39 ` Junio C Hamano
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).