Merge branch 'mh/maint-config-doc-proxy-command'

* mh/maint-config-doc-proxy-command: git-config doc: unconfuse an example git-config.txt: fix example

Junio C Hamano committed Aug 29, 2012 at 14:50 UTC 9a245ac2d38c5895f7c981ce15b19e40d9d0913f

No changes.