diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-05-17 16:34:02 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-05-17 16:34:02 -0700 |
commit | 3d1b5a1ebc2e4d9c3323a8f2b1fac732562968b5 (patch) | |
tree | 49e1d04b52edbaa0b3d2fc549ad3cdbe30f9e1ee /git-am.html | |
parent | ba7fe50148ec50de8394e1fe0f672c47bf6d4c17 (diff) | |
download | git-htmldocs-3d1b5a1ebc2e4d9c3323a8f2b1fac732562968b5.tar.gz |
Autogenerated HTML docs for v1.8.3-rc3
Diffstat (limited to 'git-am.html')
-rw-r--r-- | git-am.html | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/git-am.html b/git-am.html index 0710bc307..e4fff695f 100644 --- a/git-am.html +++ b/git-am.html @@ -746,12 +746,12 @@ git-am(1) Manual Page <h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<pre class="content"><em>git am</em> [--signoff] [--keep] [--keep-cr | --no-keep-cr] [--utf8 | --no-utf8]
+<pre class="content"><em>git am</em> [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]
[--3way] [--interactive] [--committer-date-is-author-date]
[--ignore-date] [--ignore-space-change | --ignore-whitespace]
[--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
[--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
- [--scissors | --no-scissors]
+ [--[no-]scissors]
[(<mbox> | <Maildir>)…]
<em>git am</em> (--continue | --skip | --abort)</pre>
<div class="attribution">
@@ -812,10 +812,7 @@ current branch.</p></div> </p>
</dd>
<dt class="hdlist1">
---keep-cr
-</dt>
-<dt class="hdlist1">
---no-keep-cr
+--[no-]keep-cr
</dt>
<dd>
<p>
@@ -1100,7 +1097,7 @@ errors in the "From:" lines).</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-04-29 17:26:43 PDT
+Last updated 2013-05-17 16:33:07 PDT
</div>
</div>
</body>
|