From: Junio C Hamano Date: Thu, 8 Jun 2006 00:48:17 +0000 (+0000) Subject: Autogenerated HTML docs for v1.4.0-rc1-g99b41 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=f1d1480d8b938444a1617692e3f7df6d8e4cc911;p=git.git Autogenerated HTML docs for v1.4.0-rc1-g99b41 --- diff --git a/config.txt b/config.txt index 570b691b..a04c5adf 100644 --- a/config.txt +++ b/config.txt @@ -2,15 +2,15 @@ CONFIGURATION FILE ------------------ The git configuration file contains a number of variables that affect -the git commands behavior. They can be used by both the git plumbing -and the porcelains. The variables are divided to sections, where +the git command's behavior. They can be used by both the git plumbing +and the porcelains. The variables are divided into sections, where in the fully qualified variable name the variable itself is the last dot-separated segment and the section name is everything before the last dot. The variable names are case-insensitive and only alphanumeric characters are allowed. Some variables may appear multiple times. The syntax is fairly flexible and permissive; whitespaces are mostly -ignored. The '#' and ';' characters begin commends to the end of line, +ignored. The '#' and ';' characters begin comments to the end of line, blank lines are ignored, lines containing strings enclosed in square brackets start sections and all the other lines are recognized as setting variables, in the form 'name = value'. If there is no equal @@ -35,8 +35,8 @@ Variables ~~~~~~~~~ Note that this list is non-comprehensive and not necessarily complete. -For command-specific variables, you will find more detailed description -in the appropriate manual page. You will find description of non-core +For command-specific variables, you will find a more detailed description +in the appropriate manual page. You will find a description of non-core porcelain configuration variables in the respective porcelain documentation. core.fileMode:: @@ -52,10 +52,10 @@ core.gitProxy:: on hostnames ending with the specified domain string. This variable may be set multiple times and is matched in the given order; the first match wins. - - Can be overridden by the 'GIT_PROXY_COMMAND' environment variable - (which always applies universally, without the special "for" - handling). ++ +Can be overridden by the 'GIT_PROXY_COMMAND' environment variable +(which always applies universally, without the special "for" +handling). core.ignoreStat:: The working copy files are assumed to stay unchanged until you @@ -95,9 +95,10 @@ alias.*:: Command aliases for the gitlink:git[1] command wrapper - e.g. after defining "alias.last = cat-file commit HEAD", the invocation "git last" is equivalent to "git cat-file commit HEAD". To avoid - confusion, aliases that hide existing git commands are ignored. - Arguments are split at whitespaces, but single or double - quote pair can be used to quote them. + confusion and troubles with script usage, aliases that + hide existing git commands are ignored. Arguments are split by + spaces, the usual shell quoting and escaping is supported. + quote pair and a backslash can be used to quote them. apply.whitespace:: Tells `git-apply` how to handle whitespaces, in the same way diff --git a/git-cvsserver.html b/git-cvsserver.html index 1069033c..12a21c8f 100644 --- a/git-cvsserver.html +++ b/git-cvsserver.html @@ -299,45 +299,39 @@ over pserver for anonymous CVS access.

If you are going to offer anonymous CVS access via pserver, add a line in /etc/inetd.conf like

-
+
-
cvspserver stream tcp nowait nobody git-cvsserver pserver
+
   cvspserver stream tcp nowait nobody git-cvsserver pserver
+
-
+

Note: In some cases, you need to pass the pserver argument twice for +git-cvsserver to see it. So the line would look like

+
-
Note: In some cases, you need to pass the 'pserver' argument twice for
-git-cvsserver to see it. So the line would look like
+
   cvspserver stream tcp nowait nobody git-cvsserver pserver pserver
+
-
-
-
cvspserver stream tcp nowait nobody git-cvsserver pserver pserver
-
-
-
-
No special setup is needed for SSH access, other than having GIT tools
+

No special setup is needed for SSH access, other than having GIT tools in the PATH. If you have clients that do not accept the CVS_SERVER -env variable, you can rename git-cvsserver to cvs.

-
+env variable, you can rename git-cvsserver to cvs.

  • For each repo that you want accessible from CVS you need to edit config in the repo and add the following section.

    -
    +
    -
    [gitcvs]
    -     enabled=1
    -     # optional for debugging
    -     logfile=/path/to/logfile
    +
       [gitcvs]
    +        enabled=1
    +        # optional for debugging
    +        logfile=/path/to/logfile
    +
    -
    -
    -
    Note: you need to ensure each user that is going to invoke git-cvsserver has
    +

    Note: you need to ensure each user that is going to invoke git-cvsserver has write access to the log file and to the git repository. When offering anon access via pserver, this means that the nobody user should have write access -to at least the sqlite database at the root of the repository.

    -
    +to at least the sqlite database at the root of the repository.

  • @@ -345,18 +339,12 @@ On the client machine you need to set the following variables. CVSROOT should be set as per normal, but the directory should point at the appropriate git repo. For example:

    -
    -
    -
    For SSH access, CVS_SERVER should be set to git-cvsserver
    -
    -
    -
    -
    Example:
    -
    -
    +

    For SSH access, CVS_SERVER should be set to git-cvsserver

    +

    Example:

    +
    -
    export CVSROOT=:ext:user@server:/var/git/project.git
    -export CVS_SERVER=git-cvsserver
    +
         export CVSROOT=:ext:user@server:/var/git/project.git
    +     export CVS_SERVER=git-cvsserver
  • @@ -370,9 +358,9 @@ For SSH clients that will make commits, make sure their .bashrc file Clients should now be able to check out the project. Use the CVS module name to indicate what GIT head you want to check out. Example:

    -
    +
    -
    cvs co -d project-master master
    +
         cvs co -d project-master master
  • @@ -454,7 +442,7 @@ No keyword expansion or newline munging is supported.

    diff --git a/git-cvsserver.txt b/git-cvsserver.txt index 952635d8..e328db37 100644 --- a/git-cvsserver.txt +++ b/git-cvsserver.txt @@ -36,49 +36,62 @@ INSTALLATION 1. If you are going to offer anonymous CVS access via pserver, add a line in /etc/inetd.conf like - ++ +-- +------ cvspserver stream tcp nowait nobody git-cvsserver pserver - Note: In some cases, you need to pass the 'pserver' argument twice for - git-cvsserver to see it. So the line would look like +------ +Note: In some cases, you need to pass the 'pserver' argument twice for +git-cvsserver to see it. So the line would look like +------ cvspserver stream tcp nowait nobody git-cvsserver pserver pserver - No special setup is needed for SSH access, other than having GIT tools - in the PATH. If you have clients that do not accept the CVS_SERVER - env variable, you can rename git-cvsserver to cvs. - +------ +No special setup is needed for SSH access, other than having GIT tools +in the PATH. If you have clients that do not accept the CVS_SERVER +env variable, you can rename git-cvsserver to cvs. +-- 2. For each repo that you want accessible from CVS you need to edit config in the repo and add the following section. - ++ +-- +------ [gitcvs] enabled=1 # optional for debugging logfile=/path/to/logfile - Note: you need to ensure each user that is going to invoke git-cvsserver has - write access to the log file and to the git repository. When offering anon - access via pserver, this means that the nobody user should have write access - to at least the sqlite database at the root of the repository. - +------ +Note: you need to ensure each user that is going to invoke git-cvsserver has +write access to the log file and to the git repository. When offering anon +access via pserver, this means that the nobody user should have write access +to at least the sqlite database at the root of the repository. +-- 3. On the client machine you need to set the following variables. CVSROOT should be set as per normal, but the directory should point at the appropriate git repo. For example: ++ +-- +For SSH access, CVS_SERVER should be set to git-cvsserver - For SSH access, CVS_SERVER should be set to git-cvsserver - - Example: +Example: +------ export CVSROOT=:ext:user@server:/var/git/project.git export CVS_SERVER=git-cvsserver - +------ +-- 4. For SSH clients that will make commits, make sure their .bashrc file sets the GIT_AUTHOR and GIT_COMMITTER variables. 5. Clients should now be able to check out the project. Use the CVS 'module' name to indicate what GIT 'head' you want to check out. Example: - ++ +------ cvs co -d project-master master +------ Eclipse CVS Client Notes ------------------------ diff --git a/git-ls-tree.html b/git-ls-tree.html index caf41d24..e99a7526 100644 --- a/git-ls-tree.html +++ b/git-ls-tree.html @@ -355,7 +355,7 @@ arguments does not matter.

    - Instead of showing the path names relative the current working + Instead of showing the path names relative to the current working directory, show the full path names.

    @@ -397,7 +397,7 @@ another major rewrite by Linus Torvalds <torvalds@osdl.org>

    diff --git a/git-ls-tree.txt b/git-ls-tree.txt index 7e072b53..f283bacb 100644 --- a/git-ls-tree.txt +++ b/git-ls-tree.txt @@ -49,7 +49,7 @@ OPTIONS Non default number of digits can be specified with --abbrev=. --full-name:: - Instead of showing the path names relative the current working + Instead of showing the path names relative to the current working directory, show the full path names. paths:: diff --git a/git-repo-config.html b/git-repo-config.html index 2d69a87e..e306688c 100644 --- a/git-repo-config.html +++ b/git-repo-config.html @@ -489,14 +489,14 @@ i.e. the one without a "for …" postfix, do something like this:

    CONFIGURATION FILE

    The git configuration file contains a number of variables that affect -the git commands behavior. They can be used by both the git plumbing -and the porcelains. The variables are divided to sections, where +the git command's behavior. They can be used by both the git plumbing +and the porcelains. The variables are divided into sections, where in the fully qualified variable name the variable itself is the last dot-separated segment and the section name is everything before the last dot. The variable names are case-insensitive and only alphanumeric characters are allowed. Some variables may appear multiple times.

    The syntax is fairly flexible and permissive; whitespaces are mostly -ignored. The # and ; characters begin commends to the end of line, +ignored. The # and ; characters begin comments to the end of line, blank lines are ignored, lines containing strings enclosed in square brackets start sections and all the other lines are recognized as setting variables, in the form name = value. If there is no equal @@ -520,8 +520,8 @@ enclosed in double quotes; some variables may require special value format.

    Variables

    Note that this list is non-comprehensive and not necessarily complete. -For command-specific variables, you will find more detailed description -in the appropriate manual page. You will find description of non-core +For command-specific variables, you will find a more detailed description +in the appropriate manual page. You will find a description of non-core porcelain configuration variables in the respective porcelain documentation.

    @@ -547,12 +547,9 @@ core.gitProxy may be set multiple times and is matched in the given order; the first match wins.

    -
    -
    -
    Can be overridden by the 'GIT_PROXY_COMMAND' environment variable
    +

    Can be overridden by the GIT_PROXY_COMMAND environment variable (which always applies universally, without the special "for" -handling).

    -
    +handling).

    core.ignoreStat @@ -626,9 +623,10 @@ alias.* Command aliases for the git(1) command wrapper - e.g. after defining "alias.last = cat-file commit HEAD", the invocation "git last" is equivalent to "git cat-file commit HEAD". To avoid - confusion, aliases that hide existing git commands are ignored. - Arguments are split at whitespaces, but single or double - quote pair can be used to quote them. + confusion and troubles with script usage, aliases that + hide existing git commands are ignored. Arguments are split by + spaces, the usual shell quoting and escaping is supported. + quote pair and a backslash can be used to quote them.

    @@ -856,7 +854,7 @@ imap