Sync with 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 18 Dec 2012 18:51:22 +0000 (10:51 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 18 Dec 2012 18:51:22 +0000 (10:51 -0800)
1  2 
Documentation/diff-options.txt

Simple merge