Browse Source

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

Documentation fix.

* ah/doc-interpret-trailers-ifexists:
  Documentation: fix reference to ifExists for interpret-trailers
maint
Junio C Hamano 8 years ago
parent
commit
04dad2493b
  1. 2
      Documentation/git-interpret-trailers.txt

2
Documentation/git-interpret-trailers.txt

@ -123,7 +123,7 @@ trailer.ifexists:: @@ -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

Loading…
Cancel
Save