Merge branch 'ls/typofix'
* ls/typofix: pretty: fix a typo in the documentation for %(trailers)maint
						commit
						e004fd6b69
					
				|  | @ -271,7 +271,7 @@ endif::git-rev-list[] | ||||||
| 			  `trailers` string may be followed by a colon | 			  `trailers` string may be followed by a colon | ||||||
| 			  and zero or more comma-separated options. | 			  and zero or more comma-separated options. | ||||||
| 			  If any option is provided multiple times the | 			  If any option is provided multiple times the | ||||||
| 			  last occurance wins. | 			  last occurrence wins. | ||||||
| + | + | ||||||
| The boolean options accept an optional value `[=<BOOL>]`. The values | The boolean options accept an optional value `[=<BOOL>]`. The values | ||||||
| `true`, `false`, `on`, `off` etc. are all accepted. See the "boolean" | `true`, `false`, `on`, `off` etc. are all accepted. See the "boolean" | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	 Junio C Hamano
						Junio C Hamano