Documentation: fix reference to ifExists for interpret-trailers
authorAndreas Heiduk <asheiduk@gmail.com>
Mon, 22 May 2017 19:45:33 +0000 (21:45 +0200)
committerJunio C Hamano <gitster@pobox.com>
Tue, 23 May 2017 05:18:26 +0000 (14:18 +0900)
The manual for "git interpret-trailers" mentioned a non-existing
literal `overwrite` for its config option `trailer.ifexists`. The
correct name for that choice is `replace`.

Signed-off-by: Andreas Heiduk <asheiduk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-interpret-trailers.txt
index 09074c75a46b148485f836e1e10d7590f98d54b6..31cdeaecdfde8fb358c35c3a9a2e3c4279d440d0 100644 (file)
@@ -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