diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2007-02-12 07:15:35 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2007-02-12 07:15:35 +0000 |
commit | 9dd8bb07118fe70186522d7d8fd7da7a785a2a5e (patch) | |
tree | 8185046ca73ba739381e03f0c56f7e95d3679b3b /git-am.html | |
parent | 9cb74f2e1ce669d810cf666f33749c4785472ba6 (diff) | |
download | git-htmldocs-9dd8bb07118fe70186522d7d8fd7da7a785a2a5e.tar.gz |
Autogenerated HTML docs for v1.5.0-rc4-345-gb4d2
Diffstat (limited to 'git-am.html')
-rw-r--r-- | git-am.html | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/git-am.html b/git-am.html index ba3865bcf..993d2b4b8 100644 --- a/git-am.html +++ b/git-am.html @@ -274,7 +274,8 @@ git-am(1) Manual Page <div class="sectionbody">
<div class="verseblock">
<div class="content"><em>git-am</em> [--signoff] [--dotest=<dir>] [--utf8 | --no-utf8] [--binary] [--3way]
- [--interactive] [--whitespace=<option>] <mbox>…
+ [--interactive] [--whitespace=<option>] [-C<n>] [-p<n>]
+ <mbox>…
<em>git-am</em> [--skip | --resolved]</div></div>
</div>
<h2>DESCRIPTION</h2>
@@ -383,11 +384,11 @@ default. You could use <tt>--no-utf8</tt> to override this.</p> </p>
</dd>
<dt>
--C<n>
+-C<n>, -p<n>
</dt>
<dd>
<p>
- This flag is passed to the <tt>git-apply</tt> program that applies
+ These flag are passed to the <tt>git-apply</tt> program that applies
the patch.
</p>
</dd>
@@ -458,7 +459,7 @@ names.</p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 12-Feb-2007 04:14:05 UTC
+Last updated 12-Feb-2007 07:15:19 UTC
</div>
</div>
</body>
|