diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-05 03:03:19 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-05 03:03:19 +0300 |
| commit | 04dad2493b6607c062952abe07c25f66b6dfb07a (patch) | |
| tree | aca487cb9362e8fbbb9cac66fa41e263a3542bfd /Documentation | |
| parent | 0d86bbdc11c1c5afc33f072824f753ffeacbf13c (diff) | |
| parent | b275da816c7eaf91b38c7de8757e461f4c92c0a4 (diff) | |
Merge branch 'ah/doc-interpret-trailers-ifexists' into maint
Documentation fix.
* ah/doc-interpret-trailers-ifexists:
Documentation: fix reference to ifExists for interpret-trailers
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-interpret-trailers.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt index 09074c75a46..31cdeaecdfd 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 |