Autogenerated HTML docs for v1.5.3.4-383-gd90a

diff --git a/config.txt b/config.txt
index d4a476e2ff9322348df099bfdfbba2832c8d47a4..edf50cd2113e73daa0a05c16a416424441f010f3 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -324,10 +324,11 @@ branch.<name>.remote::
        If this option is not given, `git fetch` defaults to remote "origin".
 
 branch.<name>.merge::
-       When in branch <name>, it tells `git fetch` the default refspec to
-       be marked for merging in FETCH_HEAD. The value has exactly to match
-       a remote part of one of the refspecs which are fetched from the remote
-       given by "branch.<name>.remote".
+       When in branch <name>, it tells `git fetch` the default
+       refspec to be marked for merging in FETCH_HEAD. The value is
+       handled like the remote part of a refspec, and must match a
+       ref which is fetched from the remote given by
+       "branch.<name>.remote".
        The merge information is used by `git pull` (which at first calls
        `git fetch`) to lookup the default branch for merging. Without
        this option, `git pull` defaults to merge the first refspec fetched.

diff --git a/git-config.html b/git-config.html
index f9d4240126a5901832b88742ef68856b8f8c91b8..b57444bf11b7004982ca8fbd2907ce4aebe71cd6 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -1101,10 +1101,11 @@ branch.<name>.merge
 </dt>\r
 <dd>\r
 <p>\r
-        When in branch &lt;name&gt;, it tells <tt>git fetch</tt> the default refspec to\r
-        be marked for merging in FETCH_HEAD. The value has exactly to match\r
-        a remote part of one of the refspecs which are fetched from the remote\r
-        given by "branch.&lt;name&gt;.remote".\r
+        When in branch &lt;name&gt;, it tells <tt>git fetch</tt> the default\r
+        refspec to be marked for merging in FETCH_HEAD. The value is\r
+        handled like the remote part of a refspec, and must match a\r
+        ref which is fetched from the remote given by\r
+        "branch.&lt;name&gt;.remote".\r
         The merge information is used by <tt>git pull</tt> (which at first calls\r
         <tt>git fetch</tt>) to lookup the default branch for merging. Without\r
         this option, <tt>git pull</tt> defaults to merge the first refspec fetched.\r
@@ -1941,7 +1942,7 @@ transfer.unpackLimit
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 23-Oct-2007 01:21:46 UTC\r
+Last updated 25-Oct-2007 06:49:38 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-http-push.html b/git-http-push.html
index 62377e330d91f206553b6ac5dc04413da3b3b30b..0b9e86393da9b22edc22a2c85ba748c088f2c141 100644 (file)
--- a/git-http-push.html
+++ b/git-http-push.html
@@ -272,7 +272,7 @@ git-http-push(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p><em>git-http-push</em> [--all] [--force] [--verbose] &lt;url&gt; &lt;ref&gt; [&lt;ref&gt;&#8230;]</p>\r
+<p><em>git-http-push</em> [--all] [--dry-run] [--force] [--verbose] &lt;url&gt; &lt;ref&gt; [&lt;ref&gt;&#8230;]</p>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -305,6 +305,14 @@ remote branch.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--dry-run\r
+</dt>\r
+<dd>\r
+<p>\r
+        Do everything except actually send the updates.\r
+</p>\r
+</dd>\r
+<dt>\r
 --verbose\r
 </dt>\r
 <dd>\r
@@ -412,7 +420,7 @@ to disable the fast-forward check only on that ref.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:43 UTC\r
+Last updated 25-Oct-2007 06:49:38 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-http-push.txt b/git-http-push.txt
index 9afb860381369767a0a3f5295f588b75f559ff22..3a69b719b5cdddc9f48cdbfefe358783e12f396d 100644 (file)
--- a/git-http-push.txt
+++ b/git-http-push.txt
@@ -8,7 +8,7 @@ git-http-push - Push objects over HTTP/DAV to another repository
 
 SYNOPSIS
 --------
-'git-http-push' [--all] [--force] [--verbose] <url> <ref> [<ref>...]
+'git-http-push' [--all] [--dry-run] [--force] [--verbose] <url> <ref> [<ref>...]
 
 DESCRIPTION
 -----------
@@ -30,6 +30,9 @@ OPTIONS
        the remote repository can lose commits; use it with
        care.
 
+--dry-run::
+       Do everything except actually send the updates.
+
 --verbose::
        Report the list of objects being walked locally and the
        list of objects successfully sent to the remote repository.

diff --git a/git-send-email.html b/git-send-email.html
index 45cfbcab188b4bb3cd36a4f426913f3101ce22ee..7f70bdb4fdce7b6dedabec1b99e2b11d63c3538a 100644 (file)
--- a/git-send-email.html
+++ b/git-send-email.html
@@ -535,6 +535,14 @@ sendemail.aliasfiletype
 </p>\r
 </dd>\r
 <dt>\r
+sendemail.to\r
+</dt>\r
+<dd>\r
+<p>\r
+        Email address (or alias) to always send to.\r
+</p>\r
+</dd>\r
+<dt>\r
 sendemail.cccmd\r
 </dt>\r
 <dd>\r
@@ -609,7 +617,7 @@ send_lots_of_email.pl by Greg Kroah-Hartman.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 30-Sep-2007 00:49:45 UTC\r
+Last updated 25-Oct-2007 06:49:39 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-send-email.txt b/git-send-email.txt
index 3727776a0bf3196cd1d99ba4c2756767dca00567..e38b7021b4d38c07bd794e59be0a5e0747a8b775 100644 (file)
--- a/git-send-email.txt
+++ b/git-send-email.txt
@@ -159,6 +159,9 @@ sendemail.aliasfiletype::
        Format of the file(s) specified in sendemail.aliasesfile. Must be
        one of 'mutt', 'mailrc', 'pine', or 'gnus'.
 
+sendemail.to::
+       Email address (or alias) to always send to.
+
 sendemail.cccmd::
        Command to execute to generate per patch file specific "Cc:"s.