From 5ba2c22cf94a8ecb23dfd14fab77cc9e4166653f Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junio@hera.kernel.org>
Date: Mon, 21 Jul 2008 04:33:46 +0000
Subject: [PATCH] Autogenerated HTML docs for v1.6.0-rc0

---
 git-add.html | 17 +++++++++++++++--
 git-add.txt  |  8 +++++++-
 git-am.html  | 12 ++++++++++--
 git-am.txt   |  5 ++++-
 4 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/git-add.html b/git-add.html
index 643a85d76..3157a735a 100644
--- a/git-add.html
+++ b/git-add.html
@@ -322,7 +322,7 @@ git-add(1) Manual Page
 <div class="sectionbody">
 <div class="verseblock">
 <div class="content"><em>git add</em> [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p]
-          [--update | -u] [--refresh] [--ignore-errors] [--]
+          [--all | [--update | -u]] [--refresh] [--ignore-errors] [--]
           &lt;filepattern&gt;&#8230;</div></div>
 </div>
 <h2 id="_description">DESCRIPTION</h2>
@@ -442,6 +442,19 @@ commit.</p></div>
 </p>
 </dd>
 <dt>
+-A
+</dt>
+<dt>
+--all
+</dt>
+<dd>
+<p>
+        Update files that git already knows about (same as <em>--update</em>)
+        and add all untracked files that are not ignored by <em>.gitignore</em>
+        mechanism.
+</p>
+</dd>
+<dt>
 --refresh
 </dt>
 <dd>
@@ -673,7 +686,7 @@ double-quote and control characters will still have problems.</p></div>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2008-07-15 15:48:33 UTC
+Last updated 2008-07-21 04:33:30 UTC
 </div>
 </div>
 </body>
diff --git a/git-add.txt b/git-add.txt
index 3558905a9..2b6d6c865 100644
--- a/git-add.txt
+++ b/git-add.txt
@@ -9,7 +9,7 @@ SYNOPSIS
 --------
 [verse]
 'git add' [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p]
-	  [--update | -u] [--refresh] [--ignore-errors] [--]
+	  [--all | [--update | -u]] [--refresh] [--ignore-errors] [--]
 	  <filepattern>...
 
 DESCRIPTION
@@ -86,6 +86,12 @@ OPTIONS
 	command line. If no paths are specified, all tracked files in the
 	current directory and its subdirectories are updated.
 
+-A::
+--all::
+	Update files that git already knows about (same as '\--update')
+	and add all untracked files that are not ignored by '.gitignore'
+	mechanism.
+
 --refresh::
 	Don't add the file(s), but only refresh their stat()
 	information in the index.
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=&lt;option&gt;] [-C&lt;n&gt;] [-p&lt;n&gt;]
          [&lt;mbox&gt; | &lt;Maildir&gt;&#8230;]
-<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>
diff --git a/git-am.txt b/git-am.txt
index 2d7f16259..e010a1649 100644
--- a/git-am.txt
+++ b/git-am.txt
@@ -13,7 +13,7 @@ SYNOPSIS
          [--3way] [--interactive] [--binary]
          [--whitespace=<option>] [-C<n>] [-p<n>]
 	 [<mbox> | <Maildir>...]
-'git am' (--skip | --resolved)
+'git am' (--skip | --resolved | --abort)
 
 DESCRIPTION
 -----------
@@ -99,6 +99,9 @@ default.   You could use `--no-utf8` to override this.
 	or `--skip` to handle the failure.  This is solely
 	for internal use between 'git-rebase' and 'git-am'.
 
+--abort::
+	Restore the original branch and abort the patching operation.
+
 DISCUSSION
 ----------
 
-- 
2.26.2