Skip to content

Commit ae4e3f4

Browse files
committed
Merge branch 'sb/trailers-docfix'
Doc update. * sb/trailers-docfix: Documentation/git-interpret-trailers: explain possible values
2 parents 5a66930 + 1e83b9b commit ae4e3f4

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

Documentation/git-interpret-trailers.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,23 +88,26 @@ OPTIONS
8888
Specify where all new trailers will be added. A setting
8989
provided with '--where' overrides all configuration variables
9090
and applies to all '--trailer' options until the next occurrence of
91-
'--where' or '--no-where'.
91+
'--where' or '--no-where'. Possible values are `after`, `before`,
92+
`end` or `start`.
9293

9394
--if-exists <action>::
9495
--no-if-exists::
9596
Specify what action will be performed when there is already at
9697
least one trailer with the same <token> in the message. A setting
9798
provided with '--if-exists' overrides all configuration variables
9899
and applies to all '--trailer' options until the next occurrence of
99-
'--if-exists' or '--no-if-exists'.
100+
'--if-exists' or '--no-if-exists'. Possible actions are `addIfDifferent`,
101+
`addIfDifferentNeighbor`, `add`, `replace` and `doNothing`.
100102

101103
--if-missing <action>::
102104
--no-if-missing::
103105
Specify what action will be performed when there is no other
104106
trailer with the same <token> in the message. A setting
105107
provided with '--if-missing' overrides all configuration variables
106108
and applies to all '--trailer' options until the next occurrence of
107-
'--if-missing' or '--no-if-missing'.
109+
'--if-missing' or '--no-if-missing'. Possible actions are `doNothing`
110+
or `add`.
108111

109112
--only-trailers::
110113
Output only the trailers, not any other parts of the input.

0 commit comments

Comments
 (0)