From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 5 Jun 2017 00:03:19 +0000 (+0900)
Subject: Merge branch 'ah/doc-interpret-trailers-ifexists' into maint
X-Git-Tag: v2.13.1~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/04dad2493b6607c062952abe07c25f66b6dfb07a?hp=0d86bbdc11c1c5afc33f072824f753ffeacbf13c

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

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
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