From: Junio C Hamano Date: Fri, 10 Jan 2014 18:32:42 +0000 (-0800) Subject: Merge branch 'sb/diff-orderfile-config' X-Git-Tag: v1.9-rc0~35 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2da5cbd651114569b1a25d9b73c0e2afffb30aa7 Merge branch 'sb/diff-orderfile-config' Allow "git diff -O" to be configured with a new configuration variable. * sb/diff-orderfile-config: diff: add diff.orderfile configuration variable diff: let "git diff -O" read orderfile from any file and fail properly t4056: add new tests for "git diff -O" --- 2da5cbd651114569b1a25d9b73c0e2afffb30aa7