Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Jun 2011 21:01:18 +0000 (14:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Jun 2011 21:01:18 +0000 (14:01 -0700)
commitdef9803...d00c57bb8723e7859366536504eb56aa
tree2f25c86...07372632a845313f4e6ddea782c79440copy hash to clipboard (tree)
parent2765233...64c35eb43a8b46c377fb8b464469221fcopy hash to clipboard (diff)
parent4f83039...5eafaa04fd08a20a08a81436aea2d4b9copy hash to clipboard (diff)
Documentation/diff-options.txt