Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Apr 2010 01:21:29 +0000 (18:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Apr 2010 01:21:29 +0000 (18:21 -0700)
commita6018bb...ca918c4f0a35badcfd826077d07502ca
tree14bf0bc...ea0095e15cadf5d514296a2be1b2e793copy hash to clipboard (tree)
parent4553d58...374c6bfcae6b4be528bbf11c18a7efe5copy hash to clipboard (diff)
parentf78683f...a85ca16ae16e1180703d3280b272f45dcopy hash to clipboard (diff)
Documentation/config.txt
Documentation/merge-options.txt