diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2008-08-16 10:23:18 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2008-08-16 10:23:18 +0000 |
commit | 9e96a1aba0e46aba28ff6eaae57784ea5d94b0fb (patch) | |
tree | ca388b51d49dec91fdfbefb1af3c6c7c365463d3 /git-am.html | |
parent | 92a4abda8aa6d2589c4626a0ce37a614680ae905 (diff) | |
download | git-htmldocs-9e96a1aba0e46aba28ff6eaae57784ea5d94b0fb.tar.gz |
Autogenerated HTML docs for v1.6.0-rc3-17-gc14c8
Diffstat (limited to 'git-am.html')
-rw-r--r-- | git-am.html | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/git-am.html b/git-am.html index 474d025d4..26c85518b 100644 --- a/git-am.html +++ b/git-am.html @@ -322,7 +322,7 @@ git-am(1) Manual Page <div class="sectionbody">
<div class="verseblock">
<div class="content"><em>git am</em> [--signoff] [--keep] [--utf8 | --no-utf8]
- [--3way] [--interactive] [--binary]
+ [--3way] [--interactive]
[--whitespace=<option>] [-C<n>] [-p<n>]
[<mbox> | <Maildir>…]
<em>git am</em> (--skip | --resolved | --abort)</div></div>
@@ -410,18 +410,6 @@ default. You could use <tt>--no-utf8</tt> to override this.</p></div> </p>
</dd>
<dt>
--b
-</dt>
-<dt>
---binary
-</dt>
-<dd>
-<p>
- Pass <tt>--allow-binary-replacement</tt> flag to <em>git-apply</em>
- (see <a href="git-apply.html">git-apply(1)</a>).
-</p>
-</dd>
-<dt>
--whitespace=<option>
</dt>
<dd>
@@ -585,7 +573,7 @@ errors in the "From:" lines).</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-07-22 09:19:03 UTC
+Last updated 2008-08-16 10:22:58 UTC
</div>
</div>
</body>
|