Autogenerated HTML docs for v1.6.0-rc3-17-gc14c8

diff --git a/config.txt b/config.txt
index b8ec01c923a8bdb8614f5c5700a7fda603365e8b..676c39bb8436f35e1471b8dd50fd888ae1ac5c6b 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -978,6 +978,11 @@ pack.packSizeLimit::
        can be overridden by the `\--max-pack-size` option of
        linkgit:git-repack[1].
 
+pager.<cmd>::
+       Allows to set your own pager preferences for each command, overriding
+       the default. If `\--pager` or `\--no-pager` is specified on the command
+       line, it takes precedence over this option.
+
 pull.octopus::
        The default merge strategy to use when pulling multiple branches
        at once.

diff --git a/git-am.html b/git-am.html
index 474d025d45862aba22b8a1e7c76d7328be278748..26c85518b67b267c79bf2a64bab5f11a7e4c84fa 100644 (file)
--- a/git-am.html
+++ b/git-am.html
@@ -322,7 +322,7 @@ git-am(1) Manual Page
 <div class="sectionbody">\r
 <div class="verseblock">\r
 <div class="content"><em>git am</em> [--signoff] [--keep] [--utf8 | --no-utf8]\r
-         [--3way] [--interactive] [--binary]\r
+         [--3way] [--interactive]\r
          [--whitespace=&lt;option&gt;] [-C&lt;n&gt;] [-p&lt;n&gt;]\r
          [&lt;mbox&gt; | &lt;Maildir&gt;&#8230;]\r
 <em>git am</em> (--skip | --resolved | --abort)</div></div>\r
@@ -410,18 +410,6 @@ default.   You could use <tt>--no-utf8</tt> to override this.</p></div>
 </p>\r
 </dd>\r
 <dt>\r
--b\r
-</dt>\r
-<dt>\r
---binary\r
-</dt>\r
-<dd>\r
-<p>\r
-        Pass <tt>--allow-binary-replacement</tt> flag to <em>git-apply</em>\r
-        (see <a href="git-apply.html">git-apply(1)</a>).\r
-</p>\r
-</dd>\r
-<dt>\r
 --whitespace=&lt;option&gt;\r
 </dt>\r
 <dd>\r
@@ -585,7 +573,7 @@ errors in the "From:" lines).</p></div>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2008-07-22 09:19:03 UTC\r
+Last updated 2008-08-16 10:22:58 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-am.txt b/git-am.txt
index c45c53ec2404725394563a9fba40f31cd314adb2..b9c6fac7483dbefba0afb60a76ac0362aa390a6d 100644 (file)
--- a/git-am.txt
+++ b/git-am.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git am' [--signoff] [--keep] [--utf8 | --no-utf8]
-         [--3way] [--interactive] [--binary]
+        [--3way] [--interactive]
          [--whitespace=<option>] [-C<n>] [-p<n>]
         [<mbox> | <Maildir>...]
 'git am' (--skip | --resolved | --abort)
@@ -59,11 +59,6 @@ default.   You could use `--no-utf8` to override this.
        it is supposed to apply to, and we have those blobs
        available locally.
 
--b::
---binary::
-       Pass `--allow-binary-replacement` flag to 'git-apply'
-       (see linkgit:git-apply[1]).
-
 --whitespace=<option>::
        This flag is passed to the 'git-apply' (see linkgit:git-apply[1])
        program that applies

diff --git a/git-config.html b/git-config.html
index b36d750640cc795a55415eda743dba5dc8b6a0af..519d35a29c003a23e1e436a26d21e8956123a275 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -2384,6 +2384,16 @@ pack.packSizeLimit
 </p>\r
 </dd>\r
 <dt>\r
+pager.&lt;cmd&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        Allows to set your own pager preferences for each command, overriding\r
+        the default. If <tt>--pager</tt> or <tt>--no-pager</tt> is specified on the command\r
+        line, it takes precedence over this option.\r
+</p>\r
+</dd>\r
+<dt>\r
 pull.octopus\r
 </dt>\r
 <dd>\r
@@ -2700,7 +2710,7 @@ web.browser
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2008-08-06 06:19:08 UTC\r
+Last updated 2008-08-16 10:22:58 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-stash.html b/git-stash.html
index 9e61785f42eb72beec9339a646dbf35d245df391..22a945fde7dcde62aa3fb76e54e627befd64f322 100644 (file)
--- a/git-stash.html
+++ b/git-stash.html
@@ -321,11 +321,13 @@ git-stash(1) Manual Page
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
 <div class="verseblock">\r
-<div class="content"><em>git stash</em> list\r
-<em>git stash</em> (show | apply | drop | pop ) [&lt;stash&gt;]\r
+<div class="content"><em>git stash</em> list [&lt;options&gt;]\r
+<em>git stash</em> (show | drop | pop ) [&lt;stash&gt;]\r
+<em>git stash</em> apply [--index] [&lt;stash&gt;]\r
 <em>git stash</em> branch &lt;branchname&gt; [&lt;stash&gt;]\r
-<em>git stash</em> [save [&lt;message&gt;]]\r
-<em>git stash</em> clear</div></div>\r
+<em>git stash</em> [save [--keep-index] [&lt;message&gt;]]\r
+<em>git stash</em> clear\r
+<em>git stash</em> create</div></div>\r
 </div>\r
 <h2 id="_description">DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -454,6 +456,15 @@ pop [&lt;stash&gt;]
         <tt>stash@{0}</tt> is assumed. See also <tt>apply</tt>.\r
 </p>\r
 </dd>\r
+<dt>\r
+create\r
+</dt>\r
+<dd>\r
+<p>\r
+        Create a stash (which is a regular commit object) and return its\r
+        object name, without storing it anywhere in the ref namespace.\r
+</p>\r
+</dd>\r
 </dl></div>\r
 </div>\r
 <h2 id="_discussion">DISCUSSION</h2>\r
@@ -574,7 +585,7 @@ $ git commit foo -m 'Remaining parts'</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2008-07-14 03:12:31 UTC\r
+Last updated 2008-08-16 10:22:58 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-stash.txt b/git-stash.txt
index 7d50d74cc9a945f0dd82b0c26509bf0392eff837..49e2296a24825b2ea3a0976ff9073e7b44e976d8 100644 (file)
--- a/git-stash.txt
+++ b/git-stash.txt
@@ -8,11 +8,13 @@ git-stash - Stash the changes in a dirty working directory away
 SYNOPSIS
 --------
 [verse]
-'git stash' list
-'git stash' (show | apply | drop | pop ) [<stash>]
+'git stash' list [<options>]
+'git stash' (show | drop | pop ) [<stash>]
+'git stash' apply [--index] [<stash>]
 'git stash' branch <branchname> [<stash>]
-'git stash' [save [<message>]]
+'git stash' [save [--keep-index] [<message>]]
 'git stash' clear
+'git stash' create
 
 DESCRIPTION
 -----------
@@ -116,6 +118,11 @@ pop [<stash>]::
        of the current working tree state. When no `<stash>` is given,
        `stash@\{0}` is assumed. See also `apply`.
 
+create::
+
+       Create a stash (which is a regular commit object) and return its
+       object name, without storing it anywhere in the ref namespace.
+
 
 DISCUSSION
 ----------