Merge branch 'mh/maint-config-doc-proxy-command'
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 Aug 2012 21:50:30 +0000 (14:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Aug 2012 21:50:31 +0000 (14:50 -0700)
* mh/maint-config-doc-proxy-command:
  git-config doc: unconfuse an example
  git-config.txt: fix example

1  2 
Documentation/git-config.txt

Simple merge