Documentation/git-interpret-trailers: explain possible values
Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stefan Beller committed
Jul 20, 2018 at 14:53 UTC
1e83b9bfdddd726ad86f1357ae1dc2ee03f4a46f
1 file changed
+6
-3
Documentation/git-interpret-trailers.txt
+6
-3
@@ -88,7 +88,8 @@ OPTIONS
88
Specify where all new trailers will be added. A setting
89
provided with '--where' overrides all configuration variables
90
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`.
93
94
--if-exists <action>::
95
--no-if-exists::
@@ -96,7 +97,8 @@ OPTIONS
97
least one trailer with the same <token> in the message. A setting
98
provided with '--if-exists' overrides all configuration variables
99
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`.
102
103
--if-missing <action>::
104
--no-if-missing::
@@ -104,7 +106,8 @@ OPTIONS
106
trailer with the same <token> in the message. A setting
107
provided with '--if-missing' overrides all configuration variables
108
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`.
111
112
--only-trailers::
113
Output only the trailers, not any other parts of the input.