* [PATCH] Documentation/git-interpret-trailers: explain possible values
@ 2018-07-20 21:53 Stefan Beller
2018-07-20 22:23 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: Stefan Beller @ 2018-07-20 21:53 UTC (permalink / raw
To: git; +Cc: Stefan Beller
Signed-off-by: Stefan Beller <sbeller@google.com>
---
Maybe we rather want to refer to the options that are described further
down in the document?
Documentation/git-interpret-trailers.txt | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt
index 9111c47a1bf..b8fafb1e8bd 100644
--- a/Documentation/git-interpret-trailers.txt
+++ b/Documentation/git-interpret-trailers.txt
@@ -88,7 +88,8 @@ OPTIONS
Specify where all new trailers will be added. A setting
provided with '--where' overrides all configuration variables
and applies to all '--trailer' options until the next occurrence of
- '--where' or '--no-where'.
+ '--where' or '--no-where'. Possible values are `after`, `before`,
+ `end` or `start`.
--if-exists <action>::
--no-if-exists::
@@ -96,7 +97,8 @@ OPTIONS
least one trailer with the same <token> in the message. A setting
provided with '--if-exists' overrides all configuration variables
and applies to all '--trailer' options until the next occurrence of
- '--if-exists' or '--no-if-exists'.
+ '--if-exists' or '--no-if-exists'. Possible actions are `addIfDifferent`,
+ `addIfDifferentNeighbor`, `add`, `replace` and `doNothing`.
--if-missing <action>::
--no-if-missing::
@@ -104,7 +106,8 @@ OPTIONS
trailer with the same <token> in the message. A setting
provided with '--if-missing' overrides all configuration variables
and applies to all '--trailer' options until the next occurrence of
- '--if-missing' or '--no-if-missing'.
+ '--if-missing' or '--no-if-missing'. Possible actions are `doNothing`
+ or `add`.
--only-trailers::
Output only the trailers, not any other parts of the input.
--
2.18.0.233.g985f88cf7e-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Documentation/git-interpret-trailers: explain possible values
2018-07-20 21:53 [PATCH] Documentation/git-interpret-trailers: explain possible values Stefan Beller
@ 2018-07-20 22:23 ` Junio C Hamano
2018-07-20 23:44 ` Christian Couder
0 siblings, 1 reply; 3+ messages in thread
From: Junio C Hamano @ 2018-07-20 22:23 UTC (permalink / raw
To: Christian Couder; +Cc: git, Stefan Beller
Stefan Beller <sbeller@google.com> writes:
> Signed-off-by: Stefan Beller <sbeller@google.com>
> ---
>
> Maybe we rather want to refer to the options that are described further
> down in the document?
I have no strong preference either way.
The patch looks reasonable to me; Christian?
>
> Documentation/git-interpret-trailers.txt | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt
> index 9111c47a1bf..b8fafb1e8bd 100644
> --- a/Documentation/git-interpret-trailers.txt
> +++ b/Documentation/git-interpret-trailers.txt
> @@ -88,7 +88,8 @@ OPTIONS
> Specify where all new trailers will be added. A setting
> provided with '--where' overrides all configuration variables
> and applies to all '--trailer' options until the next occurrence of
> - '--where' or '--no-where'.
> + '--where' or '--no-where'. Possible values are `after`, `before`,
> + `end` or `start`.
>
> --if-exists <action>::
> --no-if-exists::
> @@ -96,7 +97,8 @@ OPTIONS
> least one trailer with the same <token> in the message. A setting
> provided with '--if-exists' overrides all configuration variables
> and applies to all '--trailer' options until the next occurrence of
> - '--if-exists' or '--no-if-exists'.
> + '--if-exists' or '--no-if-exists'. Possible actions are `addIfDifferent`,
> + `addIfDifferentNeighbor`, `add`, `replace` and `doNothing`.
>
> --if-missing <action>::
> --no-if-missing::
> @@ -104,7 +106,8 @@ OPTIONS
> trailer with the same <token> in the message. A setting
> provided with '--if-missing' overrides all configuration variables
> and applies to all '--trailer' options until the next occurrence of
> - '--if-missing' or '--no-if-missing'.
> + '--if-missing' or '--no-if-missing'. Possible actions are `doNothing`
> + or `add`.
>
> --only-trailers::
> Output only the trailers, not any other parts of the input.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Documentation/git-interpret-trailers: explain possible values
2018-07-20 22:23 ` Junio C Hamano
@ 2018-07-20 23:44 ` Christian Couder
0 siblings, 0 replies; 3+ messages in thread
From: Christian Couder @ 2018-07-20 23:44 UTC (permalink / raw
To: Junio C Hamano; +Cc: git, Stefan Beller
On Sat, Jul 21, 2018 at 12:23 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Stefan Beller <sbeller@google.com> writes:
>
>> Signed-off-by: Stefan Beller <sbeller@google.com>
>> ---
>>
>> Maybe we rather want to refer to the options that are described further
>> down in the document?
>
> I have no strong preference either way.
>
> The patch looks reasonable to me; Christian?
Yeah, it looks reasonable to me too.
I wouldn't mind also referring to the options described elsewhere, but
it could be in another patch.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-07-20 23:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-20 21:53 [PATCH] Documentation/git-interpret-trailers: explain possible values Stefan Beller
2018-07-20 22:23 ` Junio C Hamano
2018-07-20 23:44 ` Christian Couder
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).