Merge branch 'np/delta'

[git.git] / Documentation / git-config.txt

diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 8451cccf8a34d73a3b6b74be53af8ad110fc9f09..a592b61e2fe998525d0978547b3ea7e4ad2d72ac 100644 (file)
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -139,10 +139,10 @@ See also <<FILES>>.
 FILES
 -----
 
 FILES
 -----
 

-If not set explicitely with '--file', there are three files where
+If not set explicitly with '--file', there are three files where

 git-config will search for configuration options:
 
 git-config will search for configuration options:
 

-.git/config::
+$GIT_DIR/config::

        Repository specific configuration file. (The filename is
        of course relative to the repository root, not the working
        directory.)
        Repository specific configuration file. (The filename is
        of course relative to the repository root, not the working
        directory.)


@@ -214,9 +214,7 @@ Given a .git/config like this:
 
        ; Proxy settings
        [core]
 
        ; Proxy settings
        [core]

-               gitproxy="ssh" for "ssh://kernel.org/"

                gitproxy="proxy-command" for kernel.org
                gitproxy="proxy-command" for kernel.org

-               gitproxy="myprotocol-command" for "my://"

                gitproxy=default-proxy ; for all the rest
 
 you can set the filemode to true with
                gitproxy=default-proxy ; for all the rest
 
 you can set the filemode to true with


@@ -291,7 +289,7 @@ To actually match only values with an exclamation mark, you have to
 To add a new proxy, without altering any of the existing ones, use
 
 ------------
 To add a new proxy, without altering any of the existing ones, use
 
 ------------

-% git config core.gitproxy '"proxy" for example.com'
+% git config core.gitproxy '"proxy-command" for example.com'

 ------------
 
 
 ------------