Merge branch 'ls/typofix'
* ls/typofix:
pretty: fix a typo in the documentation for %(trailers)
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index 58bb279..ef6bd42 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -271,7 +271,7 @@
`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"
