diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-07-21 04:33:46 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-07-21 04:33:46 +0000 |
| commit | 5ba2c22cf94a8ecb23dfd14fab77cc9e4166653f (patch) | |
| tree | 4e7b33c34b04773b352d607bb0ab8a7141deaa29 /git-am.html | |
| parent | 915cd9bb00e770c8b6862d4d79a192d45605e1ca (diff) | |
| download | git-htmldocs-5ba2c22cf94a8ecb23dfd14fab77cc9e4166653f.tar.gz | |
Autogenerated HTML docs for v1.6.0-rc0
Diffstat (limited to 'git-am.html')
| -rw-r--r-- | git-am.html | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/git-am.html b/git-am.html index cbff300d4..f06361895 100644 --- a/git-am.html +++ b/git-am.html @@ -325,7 +325,7 @@ git-am(1) Manual Page [--3way] [--interactive] [--binary]
[--whitespace=<option>] [-C<n>] [-p<n>]
[<mbox> | <Maildir>…]
-<em>git am</em> (--skip | --resolved)</div></div>
+<em>git am</em> (--skip | --resolved | --abort)</div></div>
</div>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
@@ -492,6 +492,14 @@ default. You could use <tt>--no-utf8</tt> to override this.</p></div> for internal use between <em>git-rebase</em> and <em>git-am</em>.
</p>
</dd>
+<dt>
+--abort
+</dt>
+<dd>
+<p>
+ Restore the original branch and abort the patching operation.
+</p>
+</dd>
</dl></div>
</div>
<h2 id="_discussion">DISCUSSION</h2>
@@ -577,7 +585,7 @@ errors in the "From:" lines).</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-07-16 03:23:18 UTC
+Last updated 2008-07-21 04:33:30 UTC
</div>
</div>
</body>
|