diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-02 15:24:06 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-02 15:24:06 +0900 |
| commit | 222ed82fa30b16c05e3218a0d7fde5f8b1f0b4e4 (patch) | |
| tree | 77a466430337b3d8c5259b1e766f646947f86daf /git-interpret-trailers.html | |
| parent | d88ba73d702fe5539887dbcc805006d92c3d1a1c (diff) | |
| download | git-htmldocs-222ed82fa30b16c05e3218a0d7fde5f8b1f0b4e4.tar.gz | |
Autogenerated HTML docs for v2.13.0-384-g826c0
Diffstat (limited to 'git-interpret-trailers.html')
| -rw-r--r-- | git-interpret-trailers.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-interpret-trailers.html b/git-interpret-trailers.html index 2a1bc8e68..e8dfa3279 100644 --- a/git-interpret-trailers.html +++ b/git-interpret-trailers.html @@ -888,7 +888,7 @@ trailer.ifexists same <token> in the message.
</p>
<div class="paragraph"><p>The valid values for this option are: <code>addIfDifferentNeighbor</code> (this
-is the default), <code>addIfDifferent</code>, <code>add</code>, <code>overwrite</code> or <code>doNothing</code>.</p></div>
+is the default), <code>addIfDifferent</code>, <code>add</code>, <code>replace</code> or <code>doNothing</code>.</p></div>
<div class="paragraph"><p>With <code>addIfDifferentNeighbor</code>, a new trailer will be added only if no
trailer with the same (<token>, <value>) pair is above or below the line
where the new trailer will be added.</p></div>
@@ -1157,7 +1157,7 @@ $ chmod +x .git/hooks/commit-msg</code></pre> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2016-11-24 05:09:55 JST
+Last updated 2017-06-02 15:23:19 JST
</div>
</div>
</body>
|