summaryrefslogtreecommitdiffstats
path: root/git-interpret-trailers.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-08-17 15:21:16 -0700
committerJunio C Hamano <gitster@pobox.com>2018-08-17 15:21:16 -0700
commitbfd91f4e89b5ab0f4238e1bfb7bd0e2a82adc225 (patch)
treec33af60aaec3db5022000bba743acc5c95314c23 /git-interpret-trailers.txt
parentf09b7cd0fc08d1df0fbd5c756672772049836b7a (diff)
downloadgit-htmldocs-bfd91f4e89b5ab0f4238e1bfb7bd0e2a82adc225.tar.gz
Autogenerated HTML docs for v2.18.0-748-gfa03c
Diffstat (limited to 'git-interpret-trailers.txt')
-rw-r--r--git-interpret-trailers.txt9
1 files changed, 6 insertions, 3 deletions
diff --git a/git-interpret-trailers.txt b/git-interpret-trailers.txt
index 9111c47a1..b8fafb1e8 100644
--- a/git-interpret-trailers.txt
+++ b/git-interpret-trailers.txt
@@ -88,7 +88,8 @@ OPTIONS
Specify where all new trailers will be added. A setting
provided with '--where' overrides all configuration variables
and applies to all '--trailer' options until the next occurrence of
- '--where' or '--no-where'.
+ '--where' or '--no-where'. Possible values are `after`, `before`,
+ `end` or `start`.
--if-exists <action>::
--no-if-exists::
@@ -96,7 +97,8 @@ OPTIONS
least one trailer with the same <token> in the message. A setting
provided with '--if-exists' overrides all configuration variables
and applies to all '--trailer' options until the next occurrence of
- '--if-exists' or '--no-if-exists'.
+ '--if-exists' or '--no-if-exists'. Possible actions are `addIfDifferent`,
+ `addIfDifferentNeighbor`, `add`, `replace` and `doNothing`.
--if-missing <action>::
--no-if-missing::
@@ -104,7 +106,8 @@ OPTIONS
trailer with the same <token> in the message. A setting
provided with '--if-missing' overrides all configuration variables
and applies to all '--trailer' options until the next occurrence of
- '--if-missing' or '--no-if-missing'.
+ '--if-missing' or '--no-if-missing'. Possible actions are `doNothing`
+ or `add`.
--only-trailers::
Output only the trailers, not any other parts of the input.