From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Nov 2008 19:11:18 +0000 (-0800)
Subject: Merge branch 'mm/maint-sort-config-doc' into mm/sort-config-doc
X-Git-Tag: v1.6.1-rc1~20^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/42fc11c1103a88c49233f04dc0c2f5659b3973fe?hp=42fc11c1103a88c49233f04dc0c2f5659b3973fe

Merge branch 'mm/maint-sort-config-doc' into mm/sort-config-doc

* mm/maint-sort-config-doc:
config.txt: alphabetize configuration sections

Conflicts:
Documentation/config.txt
---