<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.1" />\r
+<meta name="generator" content="AsciiDoc 7.0.2" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git-apply</em> [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [-z] [<patch>…]</p>\r
+<div class="verseblock">\r
+<div class="content"><em>git-apply</em> [--stat] [--numstat] [--summary] [--check] [--index] [--apply]\r
+ [--no-add] [--index-info] [--allow-binary-replacement] [-z] [-pNUM]\r
+ [-CNUM] [--whitespace=<nowarn|warn|error|error-all|strip>]\r
+ [<patch>…]</div></div>\r
</div>\r
<h2>DESCRIPTION</h2>\r
<div class="sectionbody">\r
</p>\r
</dd>\r
<dt>\r
+-p<n>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Remove <n> leading slashes from traditional diff paths. The\r
+ default is 1.\r
+</p>\r
+</dd>\r
+<dt>\r
+-C<n>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Ensure at least <n> lines of surrounding context match before\r
+ and after each change. When fewer lines of surrounding\r
+ context exist they all must match. By default no context is\r
+ ever ignored.\r
+</p>\r
+</dd>\r
+<dt>\r
--apply\r
</dt>\r
<dd>\r
very limited way.\r
</p>\r
</dd>\r
+<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
+ behavior:\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
</dl>\r
</div>\r
<h2>Author</h2>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:15:45 PDT\r
+Last updated 07-Jun-2006 19:51:29 UTC\r
</div>\r
</div>\r
</body>\r