diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-02-12 08:08:08 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-02-12 08:08:08 +0000 |
| commit | b2628b18098c5ac2facedf7b1808f37bd50fa9dc (patch) | |
| tree | 5d37101e2ddc722b3a42902f0fd9de2cf6f76bc8 /git-am.html | |
| parent | e7c7be3d3137aa0f559466fc7ba937a890b1c1bb (diff) | |
| download | git-htmldocs-b2628b18098c5ac2facedf7b1808f37bd50fa9dc.tar.gz | |
Autogenerated HTML docs for v1.7.0-rc2-31-g618d1
Diffstat (limited to 'git-am.html')
| -rw-r--r-- | git-am.html | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/git-am.html b/git-am.html index 533a4981e..d093fca67 100644 --- a/git-am.html +++ b/git-am.html @@ -327,7 +327,7 @@ git-am(1) Manual Page [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
[--reject] [-q | --quiet] [--scissors | --no-scissors]
[<mbox> | <Maildir>…]
-<em>git am</em> (--skip | --resolved | --abort)</div></div>
+<em>git am</em> (--continue | --skip | --abort)</div></div>
</div>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
@@ -518,6 +518,9 @@ default. You can use <tt>--no-utf8</tt> to override this.</p></div> </p>
</dd>
<dt>
+--continue
+</dt>
+<dt>
-r
</dt>
<dt>
@@ -636,7 +639,7 @@ errors in the "From:" lines).</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-01-21 17:44:21 UTC
+Last updated 2010-02-12 08:07:54 UTC
</div>
</div>
</body>
|