aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-interpret-trailers.txt
diff options
context:
space:
mode:
authorLinus Arver <linusa@google.com>2023-06-15 02:53:47 +0000
committerJunio C Hamano <gitster@pobox.com>2023-06-14 21:42:20 -0700
commit8e80f2916b82501b9d726b75ba0df32c951e4a7e (patch)
tree94e8a54896c933c3ec1a81cba250e6fef24a07c9 /Documentation/git-interpret-trailers.txt
parent74a50fbd7f2a4a32ef6a5d7d10afa4cdaf00f8e4 (diff)
downloadgit-8e80f2916b82501b9d726b75ba0df32c951e4a7e.tar.gz
doc: trailer: use angle brackets for <token> and <value>
We already use angle brackets elsewhere, so this makes things more consistent. Signed-off-by: Linus Arver <linusa@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-interpret-trailers.txt')
-rw-r--r--Documentation/git-interpret-trailers.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt
index 7516593c47..97dc1c8c95 100644
--- a/Documentation/git-interpret-trailers.txt
+++ b/Documentation/git-interpret-trailers.txt
@@ -66,9 +66,9 @@ non-whitespace lines before a line that starts with '---' (followed by a
space or the end of the line).
When reading trailers, there can be no whitespace before or inside the
-token, but any number of regular space and tab characters are allowed
-between the token and the separator. There can be whitespaces before,
-inside or after the value. The value may be split over multiple lines
+<token>, but any number of regular space and tab characters are allowed
+between the <token> and the separator. There can be whitespaces before,
+inside or after the <value>. The <value> may be split over multiple lines
with each subsequent line starting with at least one whitespace, like
the "folding" in RFC 822.
@@ -241,7 +241,7 @@ trailer.<token>.command::
This option behaves in the same way as 'trailer.<token>.cmd', except
that it doesn't pass anything as argument to the specified command.
Instead the first occurrence of substring $ARG is replaced by the
- value that would be passed as argument.
+ <value> that would be passed as argument.
+
The 'trailer.<token>.command' option has been deprecated in favor of
'trailer.<token>.cmd' due to the fact that $ARG in the user's command is