Merge branch 'mm/config-intro-in-git-doc' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Feb 2013 16:04:17 +0000 (08:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Feb 2013 16:04:18 +0000 (08:04 -0800)
commit5cc5f09b7b12fa428ecdc3a082d77dc37c78fd3b
tree1a0e792ebe5991bb953b264d38a8ed26e5021ae1
parent92f561d7f0f249d7f15cddce1d438d229e689e87
parentc0179c0d33b0fc3c8ad30246eece220e0442fb6e
Merge branch 'mm/config-intro-in-git-doc' into maint

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