From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 29 Aug 2012 21:50:30 +0000 (-0700)
Subject: Merge branch 'mh/maint-config-doc-proxy-command'
X-Git-Tag: v1.8.0-rc0~118
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a245ac2d38c5895f7c981ce15b19e40d9d0913f;p=thirdparty%2Fgit.git

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
---

9a245ac2d38c5895f7c981ce15b19e40d9d0913f