aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-interpret-trailers.txt
diff options
context:
space:
mode:
authorLinus Arver <linusa@google.com>2023-09-07 22:20:04 +0000
committerJunio C Hamano <gitster@pobox.com>2023-09-07 23:04:44 -0700
commita6c72e7046cce70384eb54764c43e78dd4a1bfec (patch)
treeafddaa648cc1c13c5e8612b27a37d824ff4f0e73 /Documentation/git-interpret-trailers.txt
parent8c7d4acb075e0bcb8976d1802abc30a0fba52895 (diff)
downloadgit-a6c72e7046cce70384eb54764c43e78dd4a1bfec.tar.gz
trailer --only-input: prefer "configuration variables" over "rules"
Use the phrase "configuration variables" instead of "rules" because (1) we already say "configuration variables" in multiple places in the docs (where the word "rules" is only used for describing "--only-input" behavior and for an unrelated case of mentioning how the trailers do not follow "rules for RFC 822 headers"), and (2) this phrase is more specific than just "rules". 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.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt
index b5284c3d33..0eea937c30 100644
--- a/Documentation/git-interpret-trailers.txt
+++ b/Documentation/git-interpret-trailers.txt
@@ -149,8 +149,8 @@ OPTIONS
--only-input::
Output only trailers that exist in the input; do not add any
- from the command-line or by following configured `trailer.*`
- rules.
+ from the command-line or by applying `trailer.*` configuration
+ variables.
--unfold::
Remove any whitespace-continuation in trailers, so that each