{"thread":{"id":"48930","subject":"[PATCH] Documentation/git-interpret-trailers: explain possible values","startedAt":"2018-07-20T21:53:55Z","lastAt":"2018-07-20T23:44:10Z","messageCount":3,"participants":["Stefan Beller","Junio C Hamano","Christian Couder"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"353196","messageId":"20180720215349.179542-1-sbeller@google.com","threadId":"48930","inReplyTo":null,"subject":"[PATCH] Documentation/git-interpret-trailers: explain possible values","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2018-07-20T21:53:49Z","receivedAt":"2018-07-20T21:53:55Z","isPatch":true,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"Signed-off-by: Stefan Beller \n---\n\nMaybe we rather want to refer to the options that are described further\ndown in the document?\n\n Documentation/git-interpret-trailers.txt | 9 ++++++---\n 1 file changed, 6 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt\nindex 9111c47a1bf..b8fafb1e8bd 100644\n--- a/Documentation/git-interpret-trailers.txt\n+++ b/Documentation/git-interpret-trailers.txt\n@@ -88,7 +88,8 @@ OPTIONS\n \tSpecify where all new trailers will be added. A setting\n \tprovided with '--where' overrides all configuration variables\n \tand applies to all '--trailer' options until the next occurrence of\n-\t'--where' or '--no-where'.\n+\t'--where' or '--no-where'. Possible values are `after`, `before`,\n+\t`end` or `start`.\n \n --if-exists ::\n --no-if-exists::\n@@ -96,7 +97,8 @@ OPTIONS\n \tleast one trailer with the same in the message. A setting\n \tprovided with '--if-exists' overrides all configuration variables\n \tand applies to all '--trailer' options until the next occurrence of\n-\t'--if-exists' or '--no-if-exists'.\n+\t'--if-exists' or '--no-if-exists'. Possible actions are `addIfDifferent`,\n+\t`addIfDifferentNeighbor`, `add`, `replace` and `doNothing`.\n \n --if-missing ::\n --no-if-missing::\n@@ -104,7 +106,8 @@ OPTIONS\n \ttrailer with the same in the message. A setting\n \tprovided with '--if-missing' overrides all configuration variables\n \tand applies to all '--trailer' options until the next occurrence of\n-\t'--if-missing' or '--no-if-missing'.\n+\t'--if-missing' or '--no-if-missing'. Possible actions are `doNothing`\n+\tor `add`.\n \n --only-trailers::\n \tOutput only the trailers, not any other parts of the input.\n-- \n2.18.0.233.g985f88cf7e-goog\n\n"},{"id":"353202","messageId":"xmqq1sbxa6mv.fsf@gitster-ct.c.googlers.com","threadId":"48930","inReplyTo":"20180720215349.179542-1-sbeller@google.com","subject":"Re: [PATCH] Documentation/git-interpret-trailers: explain possible values","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-07-20T22:23:36Z","receivedAt":"2018-07-20T22:23:40Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Stefan Beller writes:\n\n> Signed-off-by: Stefan Beller \n> ---\n>\n> Maybe we rather want to refer to the options that are described further\n> down in the document?\n\nI have no strong preference either way.\n\nThe patch looks reasonable to me; Christian?\n\n>\n> Documentation/git-interpret-trailers.txt | 9 ++++++---\n> 1 file changed, 6 insertions(+), 3 deletions(-)\n>\n> diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt\n> index 9111c47a1bf..b8fafb1e8bd 100644\n> --- a/Documentation/git-interpret-trailers.txt\n> +++ b/Documentation/git-interpret-trailers.txt\n> @@ -88,7 +88,8 @@ OPTIONS\n> \tSpecify where all new trailers will be added. A setting\n> \tprovided with '--where' overrides all configuration variables\n> \tand applies to all '--trailer' options until the next occurrence of\n> -\t'--where' or '--no-where'.\n> +\t'--where' or '--no-where'. Possible values are `after`, `before`,\n> +\t`end` or `start`.\n> \n> --if-exists ::\n> --no-if-exists::\n> @@ -96,7 +97,8 @@ OPTIONS\n> \tleast one trailer with the same in the message. A setting\n> \tprovided with '--if-exists' overrides all configuration variables\n> \tand applies to all '--trailer' options until the next occurrence of\n> -\t'--if-exists' or '--no-if-exists'.\n> +\t'--if-exists' or '--no-if-exists'. Possible actions are `addIfDifferent`,\n> +\t`addIfDifferentNeighbor`, `add`, `replace` and `doNothing`.\n> \n> --if-missing ::\n> --no-if-missing::\n> @@ -104,7 +106,8 @@ OPTIONS\n> \ttrailer with the same in the message. A setting\n> \tprovided with '--if-missing' overrides all configuration variables\n> \tand applies to all '--trailer' options until the next occurrence of\n> -\t'--if-missing' or '--no-if-missing'.\n> +\t'--if-missing' or '--no-if-missing'. Possible actions are `doNothing`\n> +\tor `add`.\n> \n> --only-trailers::\n> \tOutput only the trailers, not any other parts of the input.\n"},{"id":"353208","messageId":"CAP8UFD3vyphLP0P1Y2oDCCcz--qXz2G1=r9X1iVnq=bwuS9+3w@mail.gmail.com","threadId":"48930","inReplyTo":"xmqq1sbxa6mv.fsf@gitster-ct.c.googlers.com","subject":"Re: [PATCH] Documentation/git-interpret-trailers: explain possible values","fromName":"Christian Couder","fromEmail":"christian.couder@gmail.com","sentAt":"2018-07-20T23:44:07Z","receivedAt":"2018-07-20T23:44:10Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"On Sat, Jul 21, 2018 at 12:23 AM, Junio C Hamano wrote:\n> Stefan Beller writes:\n>\n>> Signed-off-by: Stefan Beller \n>> ---\n>>\n>> Maybe we rather want to refer to the options that are described further\n>> down in the document?\n>\n> I have no strong preference either way.\n>\n> The patch looks reasonable to me; Christian?\n\nYeah, it looks reasonable to me too.\n\nI wouldn't mind also referring to the options described elsewhere, but\nit could be in another patch.\n"}]}