From: Andreas Heiduk <asheiduk@gmail.com>
To: gitster@pobox.com, git@vger.kernel.org
Cc: Andreas Heiduk <asheiduk@gmail.com>
Subject: [PATCH] Documentation: Fix reference to isExists for interpret-trailers
Date: Mon, 22 May 2017 21:45:33 +0200 [thread overview]
Message-ID: <20170522194533.6394-1-asheiduk@gmail.com> (raw)
The manual for "git interpret-trailers" mentioned a non-existing
literal `overwrite` for its config option `trailer.ifexists`. Fixed
by using `replace` instead.
Signed-off-by: Andreas Heiduk <asheiduk@gmail.com>
---
Documentation/git-interpret-trailers.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt
index 09074c75a..31cdeaecd 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
--
2.13.0
next reply other threads:[~2017-05-22 19:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-22 19:45 Andreas Heiduk [this message]
2017-05-23 5:47 ` [PATCH] Documentation: Fix reference to isExists for interpret-trailers Junio C Hamano
2017-05-23 6:06 ` Christian Couder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170522194533.6394-1-asheiduk@gmail.com \
--to=asheiduk@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).