Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2011 23:48:59 +0000 (16:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2011 23:48:59 +0000 (16:48 -0700)
commit395f65d...38b13fb1fded88a330dc06c3b0951046
treee7a2d4e...845eb1349de59aa07c5d9c6455f5263dcopy hash to clipboard (tree)
parent9901923...f0994582592a34128a466c58735621fdcopy hash to clipboard (diff)
parentd28790d...31ca1bcdca7254a6b9381b6c84e91271copy hash to clipboard (diff)
Documentation/diff-options.txt