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)
commit9a245ac2d38c5895f7c981ce15b19e40d9d0913f
treed254c6b7c23bc9180c7b4a20552b568cd715c8b0
parent7bcb7473bb14943e172d3dc1dcbf42872b654cba
parentd1e1fe7569835901090b936f984117b15df43bec
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
Documentation/git-config.txt