mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-05 20:16:12 +02:00
Code

Merge branch 'sb/trailers-docfix' 

Doc update.

* sb/trailers-docfix:
  Documentation/git-interpret-trailers: explain possible values
This commit is contained in:
Junio C Hamano 2018-08-15 15:08:19 -07:00
parent 5a6693089f 1e83b9bfdd
commit ae4e3f4ae2
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Documentation/git-interpret-trailers.txt
View File

@ -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.