[PATCH] Documentation: Fix reference to isExists for interpret-trailers

Subsystems: documentation, the rest · Maintainers: Jonathan Corbet, Linus Torvalds

STALE3447d

2 messages, 2 authors, 2017-05-23 · open the first message on its own page

[PATCH] Documentation: Fix reference to isExists for interpret-trailers

From: Andreas Heiduk <hidden>
Date: 2017-05-22 19:45:48 

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 <redacted>
---
 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

Re: [PATCH] Documentation: Fix reference to isExists for interpret-trailers

From: Christian Couder <hidden>
Date: 2017-05-23 06:07:00 

On Mon, May 22, 2017 at 9:45 PM, Andreas Heiduk [off-list ref] 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.
quoted hunk
Signed-off-by: Andreas Heiduk <redacted>
---
 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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help