diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2006-03-02 09:14:51 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2006-03-02 09:14:51 +0000 |
| commit | 5f32776d3bc48bfda61e2d0586d920bc3baf4b16 (patch) | |
| tree | 40883d389d89cd117b5a3b18894816a07ec285c6 /git-am.html | |
| parent | adb9128b57d85536fbbb7577a0b0035a6ef9b43d (diff) | |
| download | git-htmldocs-5f32776d3bc48bfda61e2d0586d920bc3baf4b16.tar.gz | |
Autogenerated HTML docs for v1.2.4-gec57
Diffstat (limited to 'git-am.html')
| -rw-r--r-- | git-am.html | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/git-am.html b/git-am.html index 781ac0f10..087684b32 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=<dir>] [--utf8] [--binary] [--3way] <mbox>…
+<div class="content"><em>git-am</em> [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way]
+ [--interactive] [--whitespace=<option>] <mbox>…
<em>git-am</em> [--skip | --resolved]</div></div>
</div>
<h2>DESCRIPTION</h2>
@@ -342,6 +343,15 @@ current branch.</p> </p>
</dd>
<dt>
+--whitespace=<option>
+</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>
|