| Message ID | 3e58b6f5ea264a2c42ffbd008405b46626e0f864.1694125210.git.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b674f25b81b7d6cb1136a5a47d917b0d289e8d26 |
| Headers | show |
| Series | Fixes to trailer test script, help text, and documentation | expand |
"Linus Arver via GitGitGadget" <gitgitgadget@gmail.com> writes: > From: Linus Arver <linusa@google.com> > > It's unclear what treating something "specially" means. Good. > > Signed-off-by: Linus Arver <linusa@google.com> > --- > builtin/interpret-trailers.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/builtin/interpret-trailers.c b/builtin/interpret-trailers.c > index cf4f703c4e2..a7623dbfb2e 100644 > --- a/builtin/interpret-trailers.c > +++ b/builtin/interpret-trailers.c > @@ -109,7 +109,7 @@ int cmd_interpret_trailers(int argc, const char **argv, const char *prefix) > OPT_BOOL(0, "unfold", &opts.unfold, N_("join whitespace-continued values")), > OPT_CALLBACK_F(0, "parse", &opts, NULL, N_("set parsing options"), > PARSE_OPT_NOARG | PARSE_OPT_NONEG, parse_opt_parse), > - OPT_BOOL(0, "no-divider", &opts.no_divider, N_("do not treat --- specially")), > + OPT_BOOL(0, "no-divider", &opts.no_divider, N_("do not treat \"---\" as the end of input")), > OPT_CALLBACK(0, "trailer", &trailers, N_("trailer"), > N_("trailer(s) to add"), option_parse_trailer), > OPT_END()
diff --git a/builtin/interpret-trailers.c b/builtin/interpret-trailers.c index cf4f703c4e2..a7623dbfb2e 100644 --- a/builtin/interpret-trailers.c +++ b/builtin/interpret-trailers.c @@ -109,7 +109,7 @@ int cmd_interpret_trailers(int argc, const char **argv, const char *prefix) OPT_BOOL(0, "unfold", &opts.unfold, N_("join whitespace-continued values")), OPT_CALLBACK_F(0, "parse", &opts, NULL, N_("set parsing options"), PARSE_OPT_NOARG | PARSE_OPT_NONEG, parse_opt_parse), - OPT_BOOL(0, "no-divider", &opts.no_divider, N_("do not treat --- specially")), + OPT_BOOL(0, "no-divider", &opts.no_divider, N_("do not treat \"---\" as the end of input")), OPT_CALLBACK(0, "trailer", &trailers, N_("trailer"), N_("trailer(s) to add"), option_parse_trailer), OPT_END()