{"thread":{"id":"46026","subject":"[PATCH] Documentation: Fix reference to isExists for interpret-trailers","startedAt":"2017-05-22T19:45:48Z","lastAt":"2017-05-23T06:07:00Z","messageCount":3,"participants":["Andreas Heiduk","Junio C Hamano","Christian Couder"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"320465","messageId":"20170522194533.6394-1-asheiduk@gmail.com","threadId":"46026","inReplyTo":null,"subject":"[PATCH] Documentation: Fix reference to isExists for interpret-trailers","fromName":"Andreas Heiduk","fromEmail":"asheiduk@gmail.com","sentAt":"2017-05-22T19:45:33Z","receivedAt":"2017-05-22T19:45:48Z","isPatch":true,"sender":{"key":"asheiduk@gmail.com","avatar":"https://avatars.githubusercontent.com/u/9371344?v=4"},"body":"The manual for \"git interpret-trailers\" mentioned a non-existing\nliteral `overwrite` for its config option `trailer.ifexists`. Fixed\nby using `replace` instead.\n\nSigned-off-by: Andreas Heiduk <asheiduk@gmail.com>\n---\n Documentation/git-interpret-trailers.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt\nindex 09074c75a..31cdeaecd 100644\n--- a/Documentation/git-interpret-trailers.txt\n+++ b/Documentation/git-interpret-trailers.txt\n@@ -123,7 +123,7 @@ trailer.ifexists::\n \tsame <token> in the message.\n +\n The valid values for this option are: `addIfDifferentNeighbor` (this\n-is the default), `addIfDifferent`, `add`, `overwrite` or `doNothing`.\n+is the default), `addIfDifferent`, `add`, `replace` or `doNothing`.\n +\n With `addIfDifferentNeighbor`, a new trailer will be added only if no\n trailer with the same (<token>, <value>) pair is above or below the line\n-- \n2.13.0\n\n"},{"id":"320523","messageId":"xmqqmva4ktuq.fsf@gitster.mtv.corp.google.com","threadId":"46026","inReplyTo":"20170522194533.6394-1-asheiduk@gmail.com","subject":"Re: [PATCH] Documentation: Fix reference to isExists for interpret-trailers","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-05-23T05:47:09Z","receivedAt":"2017-05-23T05:47:16Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks.  I'll fix s/is/if/ on the title (no need to resend to fix\nonly the subject).\n\n"},{"id":"320525","messageId":"CAP8UFD1shjAxoT2Zr+fvzoaF7cgrE-U1BOycuV4zAkNDbJwKQA@mail.gmail.com","threadId":"46026","inReplyTo":"20170522194533.6394-1-asheiduk@gmail.com","subject":"Re: [PATCH] Documentation: Fix reference to isExists for interpret-trailers","fromName":"Christian Couder","fromEmail":"christian.couder@gmail.com","sentAt":"2017-05-23T06:06:49Z","receivedAt":"2017-05-23T06:07:00Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"On Mon, May 22, 2017 at 9:45 PM, Andreas Heiduk <asheiduk@gmail.com> wrote:\n> The manual for \"git interpret-trailers\" mentioned a non-existing\n> literal `overwrite` for its config option `trailer.ifexists`. Fixed\n> by using `replace` instead.\n\nYeah, I forgot to change it to `replace` there.\n\n> Signed-off-by: Andreas Heiduk <asheiduk@gmail.com>\n> ---\n>  Documentation/git-interpret-trailers.txt | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt\n> index 09074c75a..31cdeaecd 100644\n> --- a/Documentation/git-interpret-trailers.txt\n> +++ b/Documentation/git-interpret-trailers.txt\n> @@ -123,7 +123,7 @@ trailer.ifexists::\n>         same <token> in the message.\n>  +\n>  The valid values for this option are: `addIfDifferentNeighbor` (this\n> -is the default), `addIfDifferent`, `add`, `overwrite` or `doNothing`.\n> +is the default), `addIfDifferent`, `add`, `replace` or `doNothing`.\n\nYeah, this looks obviously good to me.\n\nThanks,\nChristian.\n"}]}