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)
commitb6538a0b4eee113d207961bacc1abb6ac5b2e661
treefeb44f3e3a4fe1e51b97b57abbe2b0e4405044ec
parenteac00c508df21f6675c07bbc559348eddd0fdd73
parent560d4b86abc547dfb10b116ab99c800d68ae8849
Merge branch 'nk/config-local-doc' into maint

* nk/config-local-doc:
  config: Add description of --local option
Documentation/git-config.txt