summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-11 11:09:01 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-11 11:09:01 -0700
commitf6854cad2a7a7da0a360bd520d2a86af89a36c6c (patch)
treeaee3e98cfb4fe49ad593db48b26f7d8b1b4d556c /builtin
parentfe31b2afac2fbae25086ecd00a1f57bcd74e9148 (diff)
parentd1e1fe7569835901090b936f984117b15df43bec (diff)
downloadgit-f6854cad2a7a7da0a360bd520d2a86af89a36c6c.tar.gz
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
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions