Merge branch 'mh/maint-config-doc-proxy-command' into maint-1.7.11
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 18:09:01 +0000 (11:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 18:09:01 +0000 (11:09 -0700)
commitf6854cad2a7a7da0a360bd520d2a86af89a36c6c
treeaee3e98cfb4fe49ad593db48b26f7d8b1b4d556c
parentfe31b2afac2fbae25086ecd00a1f57bcd74e9148
parentd1e1fe7569835901090b936f984117b15df43bec
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
Documentation/git-config.txt