Autogenerated HTML docs for v1.6.0-rc0

diff --git a/git-add.html b/git-add.html
index 643a85d7678225216a1c8cb7de2b2a52e8d93809..3157a735a91b426b0c0887ba8796e9ee10e5b995 100644 (file)
--- a/git-add.html
+++ b/git-add.html
@@ -322,7 +322,7 @@ git-add(1) Manual Page
 <div class="sectionbody">\r
 <div class="verseblock">\r
 <div class="content"><em>git add</em> [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p]\r
-          [--update | -u] [--refresh] [--ignore-errors] [--]\r
+          [--all | [--update | -u]] [--refresh] [--ignore-errors] [--]\r
           &lt;filepattern&gt;&#8230;</div></div>\r
 </div>\r
 <h2 id="_description">DESCRIPTION</h2>\r
@@ -442,6 +442,19 @@ commit.</p></div>
 </p>\r
 </dd>\r
 <dt>\r
+-A\r
+</dt>\r
+<dt>\r
+--all\r
+</dt>\r
+<dd>\r
+<p>\r
+        Update files that git already knows about (same as <em>--update</em>)\r
+        and add all untracked files that are not ignored by <em>.gitignore</em>\r
+        mechanism.\r
+</p>\r
+</dd>\r
+<dt>\r
 --refresh\r
 </dt>\r
 <dd>\r
@@ -673,7 +686,7 @@ double-quote and control characters will still have problems.</p></div>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2008-07-15 15:48:33 UTC\r
+Last updated 2008-07-21 04:33:30 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-add.txt b/git-add.txt
index 3558905a92a20f1f615a48821638ce239ecb6232..2b6d6c86547b2cec370d34b14ddef25264404892 100644 (file)
--- 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 cbff300d4cca830ede57cae23f1f2f050ef41034..f063618951e7d521ffa391501d299c53824eedfc 100644 (file)
--- a/git-am.html
+++ b/git-am.html
@@ -325,7 +325,7 @@ git-am(1) Manual Page
          [--3way] [--interactive] [--binary]\r
          [--whitespace=<option>] [-C<n>] [-p<n>]\r
          [<mbox> | <Maildir>…]\r
-<em>git am</em> (--skip | --resolved)</div></div>\r
+<em>git am</em> (--skip | --resolved | --abort)</div></div>\r
 </div>\r
 <h2 id="_description">DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -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>.\r
 </p>\r
 </dd>\r
+<dt>\r
+--abort\r
+</dt>\r
+<dd>\r
+<p>\r
+        Restore the original branch and abort the patching operation.\r
+</p>\r
+</dd>\r
 </dl></div>\r
 </div>\r
 <h2 id="_discussion">DISCUSSION</h2>\r
@@ -577,7 +585,7 @@ errors in the "From:" lines).</p></div>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2008-07-16 03:23:18 UTC\r
+Last updated 2008-07-21 04:33:30 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-am.txt b/git-am.txt
index 2d7f162594cb69d5a5f6d8ef1714111ad0bbc67a..e010a164930362dea6990a4e3dda1655bc8c3500 100644 (file)
--- 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
 ----------