Autogenerated HTML docs for v1.5.0-rc0-g2708

diff --git a/config.txt b/config.txt
index 178e0e1e209e066ad220d6ba95be0728c2db5e99..2f4fc252589017b13fff74445b85c951362a6236 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -82,13 +82,13 @@ core.logAllRefUpdates::
        only when the file exists.  If this configuration
        variable is set to true, missing "$GIT_DIR/logs/<ref>"
        file is automatically created for branch heads.
-
-       This information can be used to determine what commit
-       was the tip of a branch "2 days ago".
-
-       This value is true by default in a repository that has
-       a working directory associated with it, and false by
-       default in a bare repository.
++
+This information can be used to determine what commit
+was the tip of a branch "2 days ago".
++
+This value is true by default in a repository that has
+a working directory associated with it, and false by
+default in a bare repository.
 
 core.repositoryFormatVersion::
        Internal variable identifying the repository format and layout

diff --git a/git-fetch.html b/git-fetch.html
index 021522b7c817bbef5e7ef8844bf63b651e0b6346..93806b28e3b34d5c72b35893044d55b2fd7116d1 100644 (file)
--- a/git-fetch.html
+++ b/git-fetch.html
@@ -556,7 +556,7 @@ identical to the last three above, respectively:</p>
 <p>In addition to the above, as a short-hand, the name of a\r
 file in <tt>$GIT_DIR/remotes</tt> directory can be given; the\r
 named file should be in the following format:</p>\r
-<div class="literalblock">\r
+<div class="listingblock">\r
 <div class="content">\r
 <pre><tt>URL: one of the above URL format\r
 Push: &lt;refspec&gt;\r
@@ -570,11 +570,12 @@ respectively.  Multiple <tt>Push:</tt> and <tt>Pull:</tt> lines may
 be specified for additional branch mappings.</p>\r
 <p>Or, equivalently, in the <tt>$GIT_DIR/config</tt> (note the use\r
 of <tt>fetch</tt> instead of <tt>Pull:</tt>):</p>\r
-<div class="literalblock">\r
+<div class="listingblock">\r
 <div class="content">\r
-<pre><tt>url = &lt;url&gt;\r
-push = &lt;refspec&gt;\r
-fetch = &lt;refspec&gt;</tt></pre>\r
+<pre><tt>[remote "&lt;remote&gt;"]\r
+        url = &lt;url&gt;\r
+        push = &lt;refspec&gt;\r
+        fetch = &lt;refspec&gt;</tt></pre>\r
 </div></div>\r
 <p>The name of a file in <tt>$GIT_DIR/branches</tt> directory can be\r
 specified as an older notation short-hand; the named\r
@@ -584,13 +585,13 @@ name of remote head (URL fragment notation).
 <tt>$GIT_DIR/branches/&lt;remote&gt;</tt> file that stores a &lt;url&gt;\r
 without the fragment is equivalent to have this in the\r
 corresponding file in the <tt>$GIT_DIR/remotes/</tt> directory.</p>\r
-<div class="literalblock">\r
+<div class="listingblock">\r
 <div class="content">\r
 <pre><tt>URL: &lt;url&gt;\r
 Pull: refs/heads/master:&lt;remote&gt;</tt></pre>\r
 </div></div>\r
 <p>while having <tt>&lt;url&gt;#&lt;head&gt;</tt> is equivalent to</p>\r
-<div class="literalblock">\r
+<div class="listingblock">\r
 <div class="content">\r
 <pre><tt>URL: &lt;url&gt;\r
 Pull: refs/heads/&lt;head&gt;:&lt;remote&gt;</tt></pre>\r
@@ -615,7 +616,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 24-Oct-2006 05:43:59 UTC\r
+Last updated 31-Dec-2006 08:29:25 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-pull.html b/git-pull.html
index 10171f38ba227d2b08c6e6d25cd0641d28d85c6a..a518025cc2cbb303e680e10f02e3b881a5b8f763 100644 (file)
--- a/git-pull.html
+++ b/git-pull.html
@@ -600,7 +600,7 @@ identical to the last three above, respectively:</p>
 <p>In addition to the above, as a short-hand, the name of a\r
 file in <tt>$GIT_DIR/remotes</tt> directory can be given; the\r
 named file should be in the following format:</p>\r
-<div class="literalblock">\r
+<div class="listingblock">\r
 <div class="content">\r
 <pre><tt>URL: one of the above URL format\r
 Push: &lt;refspec&gt;\r
@@ -614,11 +614,12 @@ respectively.  Multiple <tt>Push:</tt> and <tt>Pull:</tt> lines may
 be specified for additional branch mappings.</p>\r
 <p>Or, equivalently, in the <tt>$GIT_DIR/config</tt> (note the use\r
 of <tt>fetch</tt> instead of <tt>Pull:</tt>):</p>\r
-<div class="literalblock">\r
+<div class="listingblock">\r
 <div class="content">\r
-<pre><tt>url = &lt;url&gt;\r
-push = &lt;refspec&gt;\r
-fetch = &lt;refspec&gt;</tt></pre>\r
+<pre><tt>[remote "&lt;remote&gt;"]\r
+        url = &lt;url&gt;\r
+        push = &lt;refspec&gt;\r
+        fetch = &lt;refspec&gt;</tt></pre>\r
 </div></div>\r
 <p>The name of a file in <tt>$GIT_DIR/branches</tt> directory can be\r
 specified as an older notation short-hand; the named\r
@@ -628,13 +629,13 @@ name of remote head (URL fragment notation).
 <tt>$GIT_DIR/branches/&lt;remote&gt;</tt> file that stores a &lt;url&gt;\r
 without the fragment is equivalent to have this in the\r
 corresponding file in the <tt>$GIT_DIR/remotes/</tt> directory.</p>\r
-<div class="literalblock">\r
+<div class="listingblock">\r
 <div class="content">\r
 <pre><tt>URL: &lt;url&gt;\r
 Pull: refs/heads/master:&lt;remote&gt;</tt></pre>\r
 </div></div>\r
 <p>while having <tt>&lt;url&gt;#&lt;head&gt;</tt> is equivalent to</p>\r
-<div class="literalblock">\r
+<div class="listingblock">\r
 <div class="content">\r
 <pre><tt>URL: &lt;url&gt;\r
 Pull: refs/heads/&lt;head&gt;:&lt;remote&gt;</tt></pre>\r
@@ -817,7 +818,7 @@ Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 29-Oct-2006 20:47:12 UTC\r
+Last updated 31-Dec-2006 08:29:26 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-push.html b/git-push.html
index 97a00dd26350274dcfa6d89e42e040fe428a9a1c..f586e87d2dfb707448a0070ec2172c959eca70ef 100644 (file)
--- a/git-push.html
+++ b/git-push.html
@@ -447,7 +447,7 @@ identical to the last three above, respectively:</p>
 <p>In addition to the above, as a short-hand, the name of a\r
 file in <tt>$GIT_DIR/remotes</tt> directory can be given; the\r
 named file should be in the following format:</p>\r
-<div class="literalblock">\r
+<div class="listingblock">\r
 <div class="content">\r
 <pre><tt>URL: one of the above URL format\r
 Push: &lt;refspec&gt;\r
@@ -461,11 +461,12 @@ respectively.  Multiple <tt>Push:</tt> and <tt>Pull:</tt> lines may
 be specified for additional branch mappings.</p>\r
 <p>Or, equivalently, in the <tt>$GIT_DIR/config</tt> (note the use\r
 of <tt>fetch</tt> instead of <tt>Pull:</tt>):</p>\r
-<div class="literalblock">\r
+<div class="listingblock">\r
 <div class="content">\r
-<pre><tt>url = &lt;url&gt;\r
-push = &lt;refspec&gt;\r
-fetch = &lt;refspec&gt;</tt></pre>\r
+<pre><tt>[remote "&lt;remote&gt;"]\r
+        url = &lt;url&gt;\r
+        push = &lt;refspec&gt;\r
+        fetch = &lt;refspec&gt;</tt></pre>\r
 </div></div>\r
 <p>The name of a file in <tt>$GIT_DIR/branches</tt> directory can be\r
 specified as an older notation short-hand; the named\r
@@ -475,13 +476,13 @@ name of remote head (URL fragment notation).
 <tt>$GIT_DIR/branches/&lt;remote&gt;</tt> file that stores a &lt;url&gt;\r
 without the fragment is equivalent to have this in the\r
 corresponding file in the <tt>$GIT_DIR/remotes/</tt> directory.</p>\r
-<div class="literalblock">\r
+<div class="listingblock">\r
 <div class="content">\r
 <pre><tt>URL: &lt;url&gt;\r
 Pull: refs/heads/master:&lt;remote&gt;</tt></pre>\r
 </div></div>\r
 <p>while having <tt>&lt;url&gt;#&lt;head&gt;</tt> is equivalent to</p>\r
-<div class="literalblock">\r
+<div class="listingblock">\r
 <div class="content">\r
 <pre><tt>URL: &lt;url&gt;\r
 Pull: refs/heads/&lt;head&gt;:&lt;remote&gt;</tt></pre>\r
@@ -502,7 +503,7 @@ by Linus Torvalds &lt;torvalds@osdl.org&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 13-Dec-2006 10:14:07 UTC\r
+Last updated 31-Dec-2006 08:29:27 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-repo-config.html b/git-repo-config.html
index 52503e05f0c34e3e755aee02c3394d9030c46941..ed5373e496ae05efa64d6294c6dcbd793631c2ca 100644 (file)
--- a/git-repo-config.html
+++ b/git-repo-config.html
@@ -430,7 +430,10 @@ you use --global option without $HOME being properly set.
 </dt>\r
 <dd>\r
 <p>\r
-        git-repo-config will ensure that the output is a simple decimal number\r
+        git-repo-config will ensure that the output is a simple\r
+        decimal number.  An optional value suffix of <em>k</em>, <em>m</em>, or <em>g</em>\r
+        in the config file will cause the value to be multiplied\r
+        by 1024, 1048576, or 1073741824 prior to output.\r
 </p>\r
 </dd>\r
 </dl>\r
@@ -662,17 +665,11 @@ core.logAllRefUpdates
         variable is set to true, missing "$GIT_DIR/logs/&lt;ref&gt;"\r
         file is automatically created for branch heads.\r
 </p>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>This information can be used to determine what commit\r
-was the tip of a branch "2 days ago".</tt></pre>\r
-</div></div>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>This value is true by default in a repository that has\r
+<p>This information can be used to determine what commit\r
+was the tip of a branch "2 days ago".</p>\r
+<p>This value is true by default in a repository that has\r
 a working directory associated with it, and false by\r
-default in a bare repository.</tt></pre>\r
-</div></div>\r
+default in a bare repository.</p>\r
 </dd>\r
 <dt>\r
 core.repositoryFormatVersion\r
@@ -1215,7 +1212,7 @@ receive.denyNonFastForwards
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 29-Dec-2006 05:18:19 UTC\r
+Last updated 31-Dec-2006 08:29:27 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-repo-config.txt b/git-repo-config.txt
index b379ec5075981347e75d0795e44e57620d89399b..c55a8ba0dcfc63110920bf6b5e8db91732d11853 100644 (file)
--- a/git-repo-config.txt
+++ b/git-repo-config.txt
@@ -87,7 +87,10 @@ OPTIONS
        git-repo-config will ensure that the output is "true" or "false"
 
 --int::
-       git-repo-config will ensure that the output is a simple decimal number
+       git-repo-config will ensure that the output is a simple
+       decimal number.  An optional value suffix of 'k', 'm', or 'g'
+       in the config file will cause the value to be multiplied
+       by 1024, 1048576, or 1073741824 prior to output.
 
 
 ENVIRONMENT

diff --git a/urls.txt b/urls.txt
index 670827c323fe276124ba1a84d59386771db868f1..870c95073bbbb74e6d40ea1dd5dc642410bc9153 100644 (file)
--- a/urls.txt
+++ b/urls.txt
@@ -40,9 +40,11 @@ In addition to the above, as a short-hand, the name of a
 file in `$GIT_DIR/remotes` directory can be given; the
 named file should be in the following format:
 
-       URL: one of the above URL format
-       Push: <refspec>
-       Pull: <refspec>
+------------
+URL: one of the above URL format
+Push: <refspec>
+Pull: <refspec>
+------------
 
 Then such a short-hand is specified in place of
 <repository> without <refspec> parameters on the command
@@ -54,10 +56,12 @@ be specified for additional branch mappings.
 Or, equivalently, in the `$GIT_DIR/config` (note the use
 of `fetch` instead of `Pull:`):
 
+------------
 [remote "<remote>"]
        url = <url>
        push = <refspec>
        fetch = <refspec>
+------------
 
 The name of a file in `$GIT_DIR/branches` directory can be
 specified as an older notation short-hand; the named
@@ -68,10 +72,15 @@ name of remote head (URL fragment notation).
 without the fragment is equivalent to have this in the
 corresponding file in the `$GIT_DIR/remotes/` directory.
 
-       URL: <url>
-       Pull: refs/heads/master:<remote>
+------------
+URL: <url>
+Pull: refs/heads/master:<remote>
+------------
+
 
 while having `<url>#<head>` is equivalent to
 
-       URL: <url>
-       Pull: refs/heads/<head>:<remote>
+------------
+URL: <url>
+Pull: refs/heads/<head>:<remote>
+------------