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