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

gitster · gitster · commit 04dad2493b66 · 2017-06-05T09:03:19.000+09:00
Documentation fix.

* ah/doc-interpret-trailers-ifexists:
  Documentation: fix reference to ifExists for interpret-trailers
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ trailer.ifexists::`
`123`	`123`	`same <token> in the message.`
`124`	`124`	`+`
`125`	`125`	The valid values for this option are: `addIfDifferentNeighbor` (this
`126`		-is the default), `addIfDifferent`, `add`, `overwrite` or `doNothing`.
	`126`	+is the default), `addIfDifferent`, `add`, `replace` or `doNothing`.
`127`	`127`	`+`
`128`	`128`	With `addIfDifferentNeighbor`, a new trailer will be added only if no
`129`	`129`	`trailer with the same (<token>, <value>) pair is above or below the line`