mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ah/doc-interpret-trailers-ifexists'

Browse Source 
Documentation fix.

* ah/doc-interpret-trailers-ifexists:
  Documentation: fix reference to ifExists for interpret-trailers
This commit is contained in:
Junio C Hamano
2017-06-02 15:06:02 +09:00
parent 9ff15b080c b275da816c
commit e2be7dd4f7
1 changed files with 1 additions and 1 deletions
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