Merge branch 'nk/config-local-doc' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Jul 2013 05:51:39 +0000 (22:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Jul 2013 05:51:39 +0000 (22:51 -0700)
* nk/config-local-doc:
  config: Add description of --local option

1  2 
Documentation/git-config.txt

Simple merge