Skip to content

Commit

Permalink
Merge branch 'mh/maint-config-doc-proxy-command'
Browse files Browse the repository at this point in the history
* mh/maint-config-doc-proxy-command:
  git-config doc: unconfuse an example
  git-config.txt: fix example
  • Loading branch information
gitster committed Aug 29, 2012
2 parents 7bcb747 + d1e1fe7 commit 9a245ac
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Documentation/git-config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ Given a .git/config like this:

; Proxy settings
[core]
gitproxy="proxy-command" for kernel.org
gitproxy=proxy-command for kernel.org
gitproxy=default-proxy ; for all the rest

you can set the filemode to true with
Expand Down Expand Up @@ -342,7 +342,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

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

An example to use customized color from the configuration in your
Expand Down

0 comments on commit 9a245ac

Please sign in to comment.