Merge branch 'nk/config-local-doc'
commit869577e5fe8d4307dd39d2751cf3c5a1896d3426
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Jun 2013 20:48:55 +0000 (24 13:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Jun 2013 20:48:55 +0000 (24 13:48 -0700)
tree4fbeb863e866ff7026f78646aa49eabc384f5281
parent6f37238747002b8118d92bc0ec6c986a5d7e56ad
parent560d4b86abc547dfb10b116ab99c800d68ae8849
Merge branch 'nk/config-local-doc'

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