X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-am.html;h=087684b3215aa898479b2ee381a5940eb8033bdd;hb=5f32776d3bc48bfda61e2d0586d920bc3baf4b16;hp=781ac0f10b8fb2a19adf2f9961f5bc9bb9dd4f16;hpb=adb9128b57d85536fbbb7577a0b0035a6ef9b43d;p=git.git

diff --git a/git-am.html b/git-am.html
index 781ac0f1..087684b3 100644
--- a/git-am.html
+++ b/git-am.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 7.0.1" />
+<meta name="generator" content="AsciiDoc 7.0.2" />
 <style type="text/css">
 /* Debug borders */
 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -273,7 +273,8 @@ git-am(1) Manual Page
 <h2>SYNOPSIS</h2>
 <div class="sectionbody">
 <div class="verseblock">
-<div class="content"><em>git-am</em> [--signoff] [--dotest=&lt;dir&gt;] [--utf8] [--binary] [--3way] &lt;mbox&gt;&#8230;
+<div class="content"><em>git-am</em> [--signoff] [--dotest=&lt;dir&gt;] [--utf8] [--binary] [--3way]
+         [--interactive] [--whitespace=&lt;option&gt;] &lt;mbox&gt;&#8230;
 <em>git-am</em> [--skip | --resolved]</div></div>
 </div>
 <h2>DESCRIPTION</h2>
@@ -342,6 +343,15 @@ current branch.</p>
 </p>
 </dd>
 <dt>
+--whitespace=&lt;option&gt;
+</dt>
+<dd>
+<p>
+        This flag is passed to the <tt>git-apply</tt> program that applies
+        the patch.
+</p>
+</dd>
+<dt>
 --interactive
 </dt>
 <dd>
@@ -392,7 +402,7 @@ names.</p>
 </div>
 <h2>SEE ALSO</h2>
 <div class="sectionbody">
-<p><a href="git-applymbox.html">git-applymbox(1)</a>, <a href="git-applypatch.html">git-applypatch(1)</a>.</p>
+<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>
 </div>
 <h2>Author</h2>
 <div class="sectionbody">
@@ -408,7 +418,7 @@ names.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 06-Jan-2006 17:11:59 PDT
+Last updated 02-Mar-2006 09:14:47 UTC
 </div>
 </div>
 </body>
