![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 26 Nov 2008 19:11:18 +0000 (11:11 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 26 Nov 2008 19:11:18 +0000 (11:11 -0800) | ||
| commit | 42fc11c1103a88c49233f04dc0c2f5659b3973fe | |
| tree | e376a924ff3128ec31582fd988f166cdbfdb9413 | tree | snapshot |
| parent | f20706220ba788a40b6634255215ccb87accca70 | commit | diff |
| parent | b0f34c3d6719903e280545e73ae89f6c2ebe533f | commit | diff |
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
* mm/maint-sort-config-doc:
config.txt: alphabetize configuration sections
Conflicts:
Documentation/config.txt
| Documentation/config.txt | diff1 | | diff2 | | blob | history |
| Documentation/merge-config.txt | diff1 | | diff2 | | blob | history |