Merge branch 'ls/typofix'

gitster · gitster · commit e004fd6b6985 · 2021-05-16T21:05:24.000+09:00
* ls/typofix:
  pretty: fix a typo in the documentation for %(trailers)
diff --git 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"

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ endif::git-rev-list[]`
`271`	`271`	`trailers` string may be followed by a colon
`272`	`272`	`and zero or more comma-separated options.`
`273`	`273`	`If any option is provided multiple times the`
`274`		`- last occurance wins.`
	`274`	`+ last occurrence wins.`
`275`	`275`	`+`
`276`	`276`	The boolean options accept an optional value `[=<BOOL>]`. The values
`277`	`277`	`true`, `false`, `on`, `off` etc. are all accepted. See the "boolean"