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)
commit48050fbe15a7266fffcf06c44288761217bb74dd
tree9ea3e19c652723f4ca6fbded102e281b62c018d5
parentce209d0c72677cce41c61bfc30a82f468df804ed
parentc0179c0d33b0fc3c8ad30246eece220e0442fb6e
Merge branch 'mm/config-intro-in-git-doc'

* mm/config-intro-in-git-doc:
  git.txt: update description of the configuration mechanism
Documentation/git.txt