+<dt>\r
+--whitespace=<option>\r
+</dt>\r
+<dd>\r
+<p>\r
+ When applying a patch, detect a new or modified line\r
+ that ends with trailing whitespaces (this includes a\r
+ line that solely consists of whitespaces). By default,\r
+ the command outputs warning messages and applies the\r
+ patch.\r
+ When <tt>git-apply</tt> is used for statistics and not applying a\r
+ patch, it defaults to <tt>nowarn</tt>.\r
+ You can use different <tt><option></tt> to control this\r
+ behaviour:\r
+</p>\r
+<ul>\r
+<li>\r
+<p>\r
+<tt>nowarn</tt> turns off the trailing whitespace warning.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<tt>warn</tt> outputs warnings for a few such errors, but applies the\r
+ patch (default).\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<tt>error</tt> outputs warnings for a few such errors, and refuses\r
+ to apply the patch.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<tt>error-all</tt> is similar to <tt>error</tt> but shows all errors.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<tt>strip</tt> outputs warnings for a few such errors, strips out the\r
+ trailing whitespaces and applies the patch.\r
+</p>\r
+</li>\r
+</ul>\r
+</dd>\r
+</dl>\r
+</div>\r
+<h2>Configuration</h2>\r
+<div class="sectionbody">\r
+<dl>\r
+<dt>\r
+apply.whitespace\r
+</dt>\r
+<dd>\r
+<p>\r
+ When no <tt>--whitespace</tt> flag is given from the command\r
+ line, this configuration item is used as the default.\r
+</p>\r
+</dd>\r