<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
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
<div class="verseblock">\r
-<div class="content"><em>git-am</em> [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox>…\r
+<div class="content"><em>git-am</em> [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way]\r
+ [--interactive] [--whitespace=<option>] <mbox>…\r
<em>git-am</em> [--skip | --resolved]</div></div>\r
</div>\r
<h2>DESCRIPTION</h2>\r
</p>\r
</dd>\r
<dt>\r
+--whitespace=<option>\r
+</dt>\r
+<dd>\r
+<p>\r
+ This flag is passed to the <tt>git-apply</tt> program that applies\r
+ the patch.\r
+</p>\r
+</dd>\r
+<dt>\r
--interactive\r
</dt>\r
<dd>\r
</div>\r
<h2>SEE ALSO</h2>\r
<div class="sectionbody">\r
-<p><a href="git-applymbox.html">git-applymbox(1)</a>, <a href="git-applypatch.html">git-applypatch(1)</a>.</p>\r
+<p><a href="git-applymbox.html">git-applymbox(1)</a>, <a href="git-applypatch.html">git-applypatch(1)</a>, <a href="git-apply.html">git-apply(1)</a>.</p>\r
</div>\r
<h2>Author</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 06-Jan-2006 17:11:59 PDT\r
+Last updated 02-Mar-2006 09:14:47 UTC\r
</div>\r
</div>\r
</body>\r