* [PATCH] Documentation: Fix reference to isExists for interpret-trailers
@ 2017-05-22 19:45 Andreas Heiduk
2017-05-23 5:47 ` Junio C Hamano
2017-05-23 6:06 ` Christian Couder
0 siblings, 2 replies; 3+ messages in thread
From: Andreas Heiduk @ 2017-05-22 19:45 UTC (permalink / raw)
To: gitster, git; +Cc: Andreas Heiduk
The manual for "git interpret-trailers" mentioned a non-existing
literal `overwrite` for its config option `trailer.ifexists`. Fixed
by using `replace` instead.
Signed-off-by: Andreas Heiduk <asheiduk@gmail.com>
---
Documentation/git-interpret-trailers.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt
index 09074c75a..31cdeaecd 100644
--- a/Documentation/git-interpret-trailers.txt
+++ b/Documentation/git-interpret-trailers.txt
@@ -123,7 +123,7 @@ trailer.ifexists::
same <token> in the message.
+
The valid values for this option are: `addIfDifferentNeighbor` (this
-is the default), `addIfDifferent`, `add`, `overwrite` or `doNothing`.
+is the default), `addIfDifferent`, `add`, `replace` or `doNothing`.
+
With `addIfDifferentNeighbor`, a new trailer will be added only if no
trailer with the same (<token>, <value>) pair is above or below the line
--
2.13.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Documentation: Fix reference to isExists for interpret-trailers
2017-05-22 19:45 [PATCH] Documentation: Fix reference to isExists for interpret-trailers Andreas Heiduk
@ 2017-05-23 5:47 ` Junio C Hamano
2017-05-23 6:06 ` Christian Couder
1 sibling, 0 replies; 3+ messages in thread
From: Junio C Hamano @ 2017-05-23 5:47 UTC (permalink / raw)
To: Andreas Heiduk; +Cc: git
Thanks. I'll fix s/is/if/ on the title (no need to resend to fix
only the subject).
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Documentation: Fix reference to isExists for interpret-trailers
2017-05-22 19:45 [PATCH] Documentation: Fix reference to isExists for interpret-trailers Andreas Heiduk
2017-05-23 5:47 ` Junio C Hamano
@ 2017-05-23 6:06 ` Christian Couder
1 sibling, 0 replies; 3+ messages in thread
From: Christian Couder @ 2017-05-23 6:06 UTC (permalink / raw)
To: Andreas Heiduk; +Cc: Junio C Hamano, git
On Mon, May 22, 2017 at 9:45 PM, Andreas Heiduk <asheiduk@gmail.com> wrote:
> The manual for "git interpret-trailers" mentioned a non-existing
> literal `overwrite` for its config option `trailer.ifexists`. Fixed
> by using `replace` instead.
Yeah, I forgot to change it to `replace` there.
> Signed-off-by: Andreas Heiduk <asheiduk@gmail.com>
> ---
> Documentation/git-interpret-trailers.txt | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt
> index 09074c75a..31cdeaecd 100644
> --- a/Documentation/git-interpret-trailers.txt
> +++ b/Documentation/git-interpret-trailers.txt
> @@ -123,7 +123,7 @@ trailer.ifexists::
> same <token> in the message.
> +
> The valid values for this option are: `addIfDifferentNeighbor` (this
> -is the default), `addIfDifferent`, `add`, `overwrite` or `doNothing`.
> +is the default), `addIfDifferent`, `add`, `replace` or `doNothing`.
Yeah, this looks obviously good to me.
Thanks,
Christian.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-05-23 6:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-22 19:45 [PATCH] Documentation: Fix reference to isExists for interpret-trailers Andreas Heiduk
2017-05-23 5:47 ` Junio C Hamano
2017-05-23 6:06 ` Christian Couder
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 NNTP newsgroup(s).