Merge branch 'nk/config-local-doc'
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Jun 2013 20:48:55 +0000 (13:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Jun 2013 20:48:55 +0000 (13:48 -0700)
* nk/config-local-doc:
config: Add description of --local option

1  2 
Documentation/git-config.txt
Simple merge