diff options
| author |  Andreas Heiduk <asheiduk@gmail.com> | 2017-05-22 21:45:33 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-05-23 14:18:26 +0900 |
| commit | b275da816c7eaf91b38c7de8757e461f4c92c0a4 (patch) | |
| tree | 38b91416dd1018028171395903e9c01d84b3553a | |
| parent | Git 2.12.3 (diff) | |
| download | tgif-b275da816c7eaf91b38c7de8757e461f4c92c0a4.tar.xz | |
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>
| -rw-r--r-- | Documentation/git-interpret-trailers.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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 <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 |