From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Feb 2013 16:04:17 +0000 (-0800)
Subject: Merge branch 'mm/config-intro-in-git-doc' into maint
X-Git-Tag: v1.8.2-rc1~2^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5cc5f09b7b12fa428ecdc3a082d77dc37c78fd3b;p=thirdparty%2Fgit.git

Merge branch 'mm/config-intro-in-git-doc' into maint

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

5cc5f09b7b12fa428ecdc3a082d77dc37c78fd3b