* [PATCH] docs/pretty-formats: mention commas in %(trailers) syntax
@ 2017-12-08 5:16 Jeff King
2017-12-08 8:10 ` Eric Sunshine
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Jeff King @ 2017-12-08 5:16 UTC (permalink / raw)
To: git; +Cc: Taylor Blau, Junio C Hamano
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.
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
--
2.15.1.659.g8bd2eae3ea
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] docs/pretty-formats: mention commas in %(trailers) syntax
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 16:59 ` Junio C Hamano
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: Eric Sunshine @ 2017-12-08 8:10 UTC (permalink / raw)
To: Jeff King; +Cc: Git List, Taylor Blau, Junio C Hamano
On Fri, Dec 8, 2017 at 12:16 AM, Jeff King <peff@peff.net> wrote:
> 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
I suppose you mean: s/need/no need/
> released version of Git.
>
> Signed-off-by: Jeff King <peff@peff.net>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] docs/pretty-formats: mention commas in %(trailers) syntax
2017-12-08 8:10 ` Eric Sunshine
@ 2017-12-08 8:13 ` Jeff King
2017-12-08 17:00 ` Junio C Hamano
0 siblings, 1 reply; 7+ messages in thread
From: Jeff King @ 2017-12-08 8:13 UTC (permalink / raw)
To: Eric Sunshine; +Cc: Git List, Taylor Blau, Junio C Hamano
On Fri, Dec 08, 2017 at 03:10:34AM -0500, Eric Sunshine wrote:
> On Fri, Dec 8, 2017 at 12:16 AM, Jeff King <peff@peff.net> wrote:
> > 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
>
> I suppose you mean: s/need/no need/
Yes, indeed. Thanks.
-Peff
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] docs/pretty-formats: mention commas in %(trailers) syntax
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 16:59 ` Junio C Hamano
2017-12-09 3:44 ` Taylor Blau
2017-12-09 8:06 ` Jacob Keller
3 siblings, 0 replies; 7+ messages in thread
From: Junio C Hamano @ 2017-12-08 16:59 UTC (permalink / raw)
To: Jeff King; +Cc: git, Taylor Blau
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] docs/pretty-formats: mention commas in %(trailers) syntax
2017-12-08 8:13 ` Jeff King
@ 2017-12-08 17:00 ` Junio C Hamano
0 siblings, 0 replies; 7+ messages in thread
From: Junio C Hamano @ 2017-12-08 17:00 UTC (permalink / raw)
To: Jeff King; +Cc: Eric Sunshine, Git List, Taylor Blau
Jeff King <peff@peff.net> writes:
> On Fri, Dec 08, 2017 at 03:10:34AM -0500, Eric Sunshine wrote:
>
>> On Fri, Dec 8, 2017 at 12:16 AM, Jeff King <peff@peff.net> wrote:
>> > 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
>>
>> I suppose you mean: s/need/no need/
>
> Yes, indeed. Thanks.
Ah, I probably should switch to 'read-only' mode until I finish my
inbox.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] docs/pretty-formats: mention commas in %(trailers) syntax
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 16:59 ` Junio C Hamano
@ 2017-12-09 3:44 ` Taylor Blau
2017-12-09 8:06 ` Jacob Keller
3 siblings, 0 replies; 7+ messages in thread
From: Taylor Blau @ 2017-12-09 3:44 UTC (permalink / raw)
To: Jeff King; +Cc: git, Junio C Hamano
On Fri, Dec 08, 2017 at 12:16:36AM -0500, Jeff King wrote:
> 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.
>
> Signed-off-by: Jeff King <peff@peff.net>
My mistake, and thank you for giving this your attention.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] docs/pretty-formats: mention commas in %(trailers) syntax
2017-12-08 5:16 [PATCH] docs/pretty-formats: mention commas in %(trailers) syntax Jeff King
` (2 preceding siblings ...)
2017-12-09 3:44 ` Taylor Blau
@ 2017-12-09 8:06 ` Jacob Keller
3 siblings, 0 replies; 7+ messages in thread
From: Jacob Keller @ 2017-12-09 8:06 UTC (permalink / raw)
To: Jeff King; +Cc: Git mailing list, Taylor Blau, Junio C Hamano
On Thu, Dec 7, 2017 at 9:16 PM, Jeff King <peff@peff.net> wrote:
> 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.
>
> 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
> --
> 2.15.1.659.g8bd2eae3ea
HAH. I was recently looking at this documentation and going to send a
patch. Looks good besides the other reviewers comments.
Thanks,
Jake
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-12-09 8:07 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2017-12-09 3:44 ` Taylor Blau
2017-12-09 8:06 ` Jacob Keller
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).