aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/pretty-formats.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-05-16 21:05:24 +0900
committerJunio C Hamano <gitster@pobox.com>2021-05-16 21:05:24 +0900
commite004fd6b6985731248a2d86525e44041fb0f08a2 (patch)
tree677af162f5e062741b919d4ae468513bb3d9074d /Documentation/pretty-formats.txt
parenta8a2491e629f9f886705d8bca6e134cd15076810 (diff)
parente6f68f62e0d9551a8798c1e62eebab929b805108 (diff)
downloadgit-e004fd6b6985731248a2d86525e44041fb0f08a2.tar.gz
Merge branch 'ls/typofix'
* ls/typofix: pretty: fix a typo in the documentation for %(trailers)
Diffstat (limited to 'Documentation/pretty-formats.txt')
-rw-r--r--Documentation/pretty-formats.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index 58bb279528..ef6bd420ae 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -271,7 +271,7 @@ endif::git-rev-list[]
`trailers` string may be followed by a colon
and zero or more comma-separated options.
If any option is provided multiple times the
- last occurance wins.
+ last occurrence wins.
+
The boolean options accept an optional value `[=<BOOL>]`. The values
`true`, `false`, `on`, `off` etc. are all accepted. See the "boolean"