Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 17:44:23 +0000 (10:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 17:44:23 +0000 (10:44 -0700)
commitef6b43a...4b5e25afe6eee32fcfda7d2a738cec3c
treea45c82e...3b94312ae201959cf0ffa59c554f335bcopy hash to clipboard (tree)
parentbe0dca3...e960d67511ca5a75887b903ccae7cccecopy hash to clipboard (diff)
parent4c007ae...351a0a2beba57e2930ed21aed141e51ecopy hash to clipboard (diff)
Documentation/diff-options.txt