Skip to contentSkip to conversation

Documentation: Fix reference to isExists for interpret-trailers

PATCH In review Andreas Heiduk 3 participants 3 messages May 22, 2017 – May 23, 2017 Documentation

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Documentation: Fix reference to isExists for interpret-trailers

The manual for "git interpret-trailers" mentioned a non-existing literal overwrite for its config option trailer.ifexists. Fixed by using replace instead.

---
 Documentation/git-interpret-trailers.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/git-interpret-trailers.txt +1 -1
index 09074c75a..31cdeaecd 100644
@@ -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
Signature · 1 line
2.13.0
#1 lore raw

Thanks. I'll fix s/is/if/ on the title (no need to resend to fix only the subject).

#2 lore raw
In reply to Andreas Heiduk
Quoted 3 lines · 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.

Yeah, I forgot to change it to replace there.

Quoted 10 lines
---
 Documentation/git-interpret-trailers.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/git-interpret-trailers.txt +0 -0
index 09074c75a..31cdeaecd 100644

Documentation/git-interpret-trailers.txt trailer.ifexists:: · line 126

Quoted 5 lines
Documentation/git-interpret-trailers.txt +1 -1
@@ -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.