From: Andreas Heiduk Date: Mon, 22 May 2017 19:45:33 +0000 (+0200) Subject: Documentation: fix reference to ifExists for interpret-trailers X-Git-Tag: v2.13.1~6^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b275da816c7eaf91b38c7de8757e461f4c92c0a4;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt index 09074c75a4..31cdeaecdf 100644 --- a/Documentation/git-interpret-trailers.txt +++ b/Documentation/git-interpret-trailers.txt @@ -123,7 +123,7 @@ trailer.ifexists:: same 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 (, ) pair is above or below the line