Autogenerated HTML docs for v1.6.0.1-157-g7df43

diff --git a/git-daemon.html b/git-daemon.html
index ab281338900db45be2f8c8efe025456faffebb45..9716f0a42aa30946ec623f5ecdb5a1ea72888031 100644 (file)
--- a/git-daemon.html
+++ b/git-daemon.html
@@ -322,8 +322,9 @@ git-daemon(1) Manual Page
 <div class="sectionbody">\r
 <div class="verseblock">\r
 <div class="content"><em>git daemon</em> [--verbose] [--syslog] [--export-all]\r
-             [--timeout=n] [--init-timeout=n] [--strict-paths]\r
-             [--base-path=path] [--user-path | --user-path=path]\r
+             [--timeout=n] [--init-timeout=n] [--max-connections=n]\r
+             [--strict-paths] [--base-path=path] [--base-path-relaxed]\r
+             [--user-path | --user-path=path]\r
              [--interpolated-path=pathtemplate]\r
              [--reuseaddr] [--detach] [--pid-file=file]\r
              [--enable=service] [--disable=service]\r
@@ -460,6 +461,15 @@ git repositories.</p></div>
 </p>\r
 </dd>\r
 <dt>\r
+--max-connections\r
+</dt>\r
+<dd>\r
+<p>\r
+        Maximum number of concurrent clients, defaults to 32.  Set it to\r
+        zero for no limit.\r
+</p>\r
+</dd>\r
+<dt>\r
 --syslog\r
 </dt>\r
 <dd>\r
@@ -736,7 +746,7 @@ selectively enable/disable services per repository
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2008-07-06 05:16:42 UTC\r
+Last updated 2008-08-31 06:31:47 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-daemon.txt b/git-daemon.txt
index 4ba4b75c1126d87c48935e7697e05f0d5210ad2d..b08a08cd95b6da192a008c58d7973769dfe3fc8c 100644 (file)
--- a/git-daemon.txt
+++ b/git-daemon.txt
@@ -9,8 +9,9 @@ SYNOPSIS
 --------
 [verse]
 'git daemon' [--verbose] [--syslog] [--export-all]
-            [--timeout=n] [--init-timeout=n] [--strict-paths]
-            [--base-path=path] [--user-path | --user-path=path]
+            [--timeout=n] [--init-timeout=n] [--max-connections=n]
+            [--strict-paths] [--base-path=path] [--base-path-relaxed]
+            [--user-path | --user-path=path]
             [--interpolated-path=pathtemplate]
             [--reuseaddr] [--detach] [--pid-file=file]
             [--enable=service] [--disable=service]
@@ -99,6 +100,10 @@ OPTIONS
        it takes for the server to process the sub-request and time spent
        waiting for next client's request.
 
+--max-connections::
+       Maximum number of concurrent clients, defaults to 32.  Set it to
+       zero for no limit.
+
 --syslog::
        Log to syslog instead of stderr. Note that this option does not imply
        --verbose, thus by default only error conditions will be logged.

diff --git a/git-name-rev.html b/git-name-rev.html
index 78342c53cd63d95bd9f1fb9ca00111c6f5975cb8..25e1b091950067b09086e82d6407fea63bd377ac 100644 (file)
--- a/git-name-rev.html
+++ b/git-name-rev.html
@@ -405,7 +405,7 @@ not the context.</p></div>
 <div class="listingblock">\r
 <div class="content">\r
 <pre><tt>% git name-rev 33db5f4d9027a10e477ccf054b2c1ab94f74c85a\r
-33db5f4d9027a10e477ccf054b2c1ab94f74c85a tags/v0.99^0~940</tt></pre>\r
+33db5f4d9027a10e477ccf054b2c1ab94f74c85a tags/v0.99~940</tt></pre>\r
 </div></div>\r
 <div class="para"><p>Now you are wiser, because you know that it happened 940 revisions before v0.99.</p></div>\r
 <div class="para"><p>Another nice thing you can do is:</p></div>\r
@@ -428,7 +428,7 @@ not the context.</p></div>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2008-08-03 07:58:01 UTC\r
+Last updated 2008-08-31 06:31:47 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-name-rev.txt b/git-name-rev.txt
index abd2237e51dfd86bcea98320edfff8922bc04eb6..7ca8a7b48cea191b58db93581f02fa4ff265acdc 100644 (file)
--- a/git-name-rev.txt
+++ b/git-name-rev.txt
@@ -59,7 +59,7 @@ Enter 'git-name-rev':
 
 ------------
 % git name-rev 33db5f4d9027a10e477ccf054b2c1ab94f74c85a
-33db5f4d9027a10e477ccf054b2c1ab94f74c85a tags/v0.99^0~940
+33db5f4d9027a10e477ccf054b2c1ab94f74c85a tags/v0.99~940
 ------------
 
 Now you are wiser, because you know that it happened 940 revisions before v0.99.

diff --git a/gitattributes.html b/gitattributes.html
index 38436be7280a8f1ddafb97cd22d940ce1e8496b7..c2d41135f2b81f278e83aeb64ff391f873692dd4 100644 (file)
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -428,9 +428,8 @@ Unset
 </dt>\r
 <dd>\r
 <p>\r
-        Unsetting the <tt>crlf</tt> attribute on a path is meant to\r
-        mark the path as a "binary" file.  The path never goes\r
-        through line endings conversion upon checkin/checkout.\r
+        Unsetting the <tt>crlf</tt> attribute on a path tells git not to\r
+        attempt any end-of-line conversion upon checkin or checkout.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -848,6 +847,35 @@ except that they need to be wrapped like this: <tt>$Format:PLACEHOLDERS$</tt>
 in the file.  E.g. the string <tt>$Format:%H$</tt> will be replaced by the\r
 commit hash.</p></div>\r
 </div>\r
+<h2 id="_using_attribute_macros">USING ATTRIBUTE MACROS</h2>\r
+<div class="sectionbody">\r
+<div class="para"><p>You do not want any end-of-line conversions applied to, nor textual diffs\r
+produced for, any binary file you track.  You would need to specify e.g.</p></div>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>*.jpg -crlf -diff</tt></pre>\r
+</div></div>\r
+<div class="para"><p>but that may become cumbersome, when you have many attributes.  Using\r
+attribute macros, you can specify groups of attributes set or unset at\r
+the same time.  The system knows a built-in attribute macro, <tt>binary</tt>:</p></div>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>*.jpg binary</tt></pre>\r
+</div></div>\r
+<div class="para"><p>which is equivalent to the above.  Note that the attribute macros can only\r
+be "Set" (see the above example that sets "binary" macro as if it were an\r
+ordinary attribute --- setting it in turn unsets "crlf" and "diff").</p></div>\r
+</div>\r
+<h2 id="_defining_attribute_macros">DEFINING ATTRIBUTE MACROS</h2>\r
+<div class="sectionbody">\r
+<div class="para"><p>Custom attribute macros can be defined only in the <tt>.gitattributes</tt> file\r
+at the toplevel (i.e. not in any subdirectory).  The built-in attribute\r
+macro "binary" is equivalent to:</p></div>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>[attr]binary -diff -crlf</tt></pre>\r
+</div></div>\r
+</div>\r
 <h2 id="_example">EXAMPLE</h2>\r
 <div class="sectionbody">\r
 <div class="para"><p>If you have these three <tt>gitattributes</tt> file:</p></div>\r
@@ -910,7 +938,7 @@ frotz   unspecified</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2008-08-21 10:34:01 UTC\r
+Last updated 2008-08-31 06:31:48 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/gitattributes.txt b/gitattributes.txt
index 5495d695c6f61982e01e2276d108b15dddb16c52..1f23d27a61dc01a5d3988afe4593f61ee3434c4d 100644 (file)
--- a/gitattributes.txt
+++ b/gitattributes.txt
@@ -105,9 +105,8 @@ Set::
 
 Unset::
 
-       Unsetting the `crlf` attribute on a path is meant to
-       mark the path as a "binary" file.  The path never goes
-       through line endings conversion upon checkin/checkout.
+       Unsetting the `crlf` attribute on a path tells git not to
+       attempt any end-of-line conversion upon checkin or checkout.
 
 Unspecified::
 
@@ -486,6 +485,41 @@ in the file.  E.g. the string `$Format:%H$` will be replaced by the
 commit hash.
 
 
+USING ATTRIBUTE MACROS
+----------------------
+
+You do not want any end-of-line conversions applied to, nor textual diffs
+produced for, any binary file you track.  You would need to specify e.g.
+
+------------
+*.jpg -crlf -diff
+------------
+
+but that may become cumbersome, when you have many attributes.  Using
+attribute macros, you can specify groups of attributes set or unset at
+the same time.  The system knows a built-in attribute macro, `binary`:
+
+------------
+*.jpg binary
+------------
+
+which is equivalent to the above.  Note that the attribute macros can only
+be "Set" (see the above example that sets "binary" macro as if it were an
+ordinary attribute --- setting it in turn unsets "crlf" and "diff").
+
+
+DEFINING ATTRIBUTE MACROS
+-------------------------
+
+Custom attribute macros can be defined only in the `.gitattributes` file
+at the toplevel (i.e. not in any subdirectory).  The built-in attribute
+macro "binary" is equivalent to:
+
+------------
+[attr]binary -diff -crlf
+------------
+
+
 EXAMPLE
 -------