From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, Taylor Blau <me@ttaylorr.com>
Subject: Re: [PATCH] docs/pretty-formats: mention commas in %(trailers) syntax
Date: Fri, 08 Dec 2017 08:59:54 -0800 [thread overview]
Message-ID: <xmqqk1xx9mut.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20171208051636.GA24693@sigill.intra.peff.net> (Jeff King's message of "Fri, 8 Dec 2017 00:16:36 -0500")
Jeff King <peff@peff.net> writes:
> Commit 84ff053d47 (pretty.c: delimit "%(trailers)" arguments
> with ",", 2017-10-01) switched the syntax of the trailers
> placeholder, but forgot to update the documentation in
> pretty-formats.txt.
>
> There's need to mention the old syntax; it was never in a
> released version of Git.
There's or There's no?
>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
> This should go on top of tb/delimit-pretty-trailers-args-with-comma.
>
> Documentation/pretty-formats.txt | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
> index d433d50f81..e664c088a5 100644
> --- a/Documentation/pretty-formats.txt
> +++ b/Documentation/pretty-formats.txt
> @@ -204,11 +204,13 @@ endif::git-rev-list[]
> than given and there are spaces on its left, use those spaces
> - '%><(<N>)', '%><|(<N>)': similar to '% <(<N>)', '%<|(<N>)'
> respectively, but padding both sides (i.e. the text is centered)
> -- %(trailers): display the trailers of the body as interpreted by
> - linkgit:git-interpret-trailers[1]. If the `:only` option is given,
> - omit non-trailer lines from the trailer block. If the `:unfold`
> - option is given, behave as if interpret-trailer's `--unfold` option
> - was given. E.g., `%(trailers:only:unfold)` to do both.
> +- %(trailers[:options]): display the trailers of the body as interpreted
> + by linkgit:git-interpret-trailers[1]. The `trailers` string may be
> + followed by a colon and zero or more comma-separated options. If the
> + `only` option is given, omit non-trailer lines from the trailer block.
> + If the `unfold` option is given, behave as if interpret-trailer's
> + `--unfold` option was given. E.g., `%(trailers:only,unfold)` to do
> + both.
>
> NOTE: Some placeholders may depend on other options given to the
> revision traversal engine. For example, the `%g*` reflog options will
next prev parent reply other threads:[~2017-12-08 16:59 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-08 5:16 [PATCH] docs/pretty-formats: mention commas in %(trailers) syntax Jeff King
2017-12-08 8:10 ` Eric Sunshine
2017-12-08 8:13 ` Jeff King
2017-12-08 17:00 ` Junio C Hamano
2017-12-08 16:59 ` Junio C Hamano [this message]
2017-12-09 3:44 ` Taylor Blau
2017-12-09 8:06 ` Jacob Keller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqk1xx9mut.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=me@ttaylorr.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).