Documentation: fix reference to ifExists for interpret-trailers
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>
Andreas Heiduk committed
May 22, 2017 at 21:45 UTC
b275da816c7eaf91b38c7de8757e461f4c92c0a4
1 file changed
+1
-1
Documentation/git-interpret-trailers.txt
+1
-1
@@ -123,7 +123,7 @@ trailer.ifexists::
123
same <token> in the message.
124
+
125
The valid values for this option are: `addIfDifferentNeighbor` (this
126
-is the default), `addIfDifferent`, `add`, `overwrite` or `doNothing`.
126
+is the default), `addIfDifferent`, `add`, `replace` or `doNothing`.
127
+
128
With `addIfDifferentNeighbor`, a new trailer will be added only if no
129
trailer with the same (<token>, <value>) pair is above or below the line