| commit | 2da5cbd651114569b1a25d9b73c0e2afffb30aa7 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 10 Jan 2014 18:32:42 +0000 (10 10:32 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 10 Jan 2014 18:32:42 +0000 (10 10:32 -0800) | ||
| tree | 3aa0ed6450b24d67c0f62e756412dc2cd25e992d | treesnapshot (tar.gz zip) |
| parent | f8c2e3f67133e82b1df9c4cc806ba5d67670e425 | commitdiff |
| parent | 6d8940b562adc5e43068868109dffe1b9bff7f78 | commitdiff |
Merge branch 'sb/diff-orderfile-config'
Allow "git diff -O<file>" 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"
Allow "git diff -O<file>" 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"
| diff.c | diff1 | diff2 | blobhistory |
| diffcore-order.c | diff1 | diff2 | blobhistory |