Merge branch 'mm/config-intro-in-git-doc'
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Feb 2013 00:04:58 +0000 (16:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Feb 2013 00:04:58 +0000 (16:04 -0800)
* mm/config-intro-in-git-doc:
  git.txt: update description of the configuration mechanism

1  2 
Documentation/git.txt

Simple merge