Merge branch 'maint'
commit26192bee8e632e27d361d0d67a6e2a544fb1489b
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Jul 2009 17:42:23 +0000 (8 10:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Jul 2009 17:42:23 +0000 (8 10:42 -0700)
tree3313ae809c8121b9a06bf7eb1d0abb7c7caf4770
parentf581de1b7b9d17c83b188bf8ffe536fb8a9dd2a4
parent49902bd8561392e979c54344ae98dfab7a7ecf05
Merge branch 'maint'

* maint:
  Documentation: update description of shell aliases
Documentation/config.txt