From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 11 Sep 2012 18:09:01 +0000 (-0700)
Subject: Merge branch 'mh/maint-config-doc-proxy-command' into maint-1.7.11
X-Git-Tag: v1.7.11.6~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f6854cad2a7a7da0a360bd520d2a86af89a36c6c

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

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

f6854cad2a7a7da0a360bd520d2a86af89a36c6c