Merge branch 'maint'
commit7f314565fe20e324e8db1a7c233e43ca4e3683f0
authorJunio C Hamano <gitster@pobox.com>
Sun, 31 Aug 2008 23:52:53 +0000 (31 16:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 31 Aug 2008 23:52:53 +0000 (31 16:52 -0700)
treee548496395a012f6ff7072bb4fb8f5d772a9f07d
parent7df437e56b5a2c5ec7140dd097b517563db4972c
parent14877436871a1e5e38deb64abb884b480ff02567
Merge branch 'maint'

* maint:
  Document sendemail.envelopesender configuration
  Document clarification: gitmodules, gitattributes
  config.txt: Add missing colons after option name
Documentation/config.txt
Documentation/gitattributes.txt