kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Andreas Heiduk 2017-05-22 21:45:33 +02:00 committed by Junio C Hamano
parent 95d6787973
commit b275da816c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-interpret-trailers.txt
View File

@ -123,7 +123,7 @@ trailer.ifexists::
same <token> in the message. same <token> in the message.
+ +
The valid values for this option are: `addIfDifferentNeighbor` (this 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 With `addIfDifferentNeighbor`, a new trailer will be added only if no
trailer with the same (<token>, <value>) pair is above or below the line trailer with the same (<token>, <value>) pair is above or below the line