From: Junio C Hamano Date: Sun, 31 Aug 2008 06:32:05 +0000 (+0000) Subject: Autogenerated HTML docs for v1.6.0.1-157-g7df43 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fcb740a645ed3fb9e0fe666daa00f7cb20774788;p=git.git Autogenerated HTML docs for v1.6.0.1-157-g7df43 --- diff --git a/git-daemon.html b/git-daemon.html index ab2813389..9716f0a42 100644 --- a/git-daemon.html +++ b/git-daemon.html @@ -322,8 +322,9 @@ git-daemon(1) Manual Page
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] @@ -460,6 +461,15 @@ git repositories.

+--max-connections +
+
+

+ Maximum number of concurrent clients, defaults to 32. Set it to + zero for no limit. +

+
+
--syslog
@@ -736,7 +746,7 @@ selectively enable/disable services per repository
diff --git a/git-daemon.txt b/git-daemon.txt index 4ba4b75c1..b08a08cd9 100644 --- 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 78342c53c..25e1b0919 100644 --- a/git-name-rev.html +++ b/git-name-rev.html @@ -405,7 +405,7 @@ not the context.

% 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.

Another nice thing you can do is:

@@ -428,7 +428,7 @@ not the context.

diff --git a/git-name-rev.txt b/git-name-rev.txt index abd2237e5..7ca8a7b48 100644 --- 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 38436be72..c2d41135f 100644 --- a/gitattributes.html +++ b/gitattributes.html @@ -428,9 +428,8 @@ 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.

@@ -848,6 +847,35 @@ except that they need to be wrapped like this: $Format:PLACEHOLDERS$ 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

If you have these three gitattributes file:

@@ -910,7 +938,7 @@ frotz unspecified
diff --git a/gitattributes.txt b/gitattributes.txt index 5495d695c..1f23d27a6 100644 --- 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 -------