diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-01-10 10:32:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-10 10:32:42 -0800 |
| commit | 2da5cbd651114569b1a25d9b73c0e2afffb30aa7 (patch) | |
| tree | 3aa0ed6450b24d67c0f62e756412dc2cd25e992d /tree.c | |
| parent | f8c2e3f67133e82b1df9c4cc806ba5d67670e425 (diff) | |
| parent | 6d8940b562adc5e43068868109dffe1b9bff7f78 (diff) | |
| download | git-2da5cbd651114569b1a25d9b73c0e2afffb30aa7.tar.gz git-2da5cbd651114569b1a25d9b73c0e2afffb30aa7.tar.xz | |
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"
Diffstat (limited to 'tree.c')
0 files changed, 0 insertions, 0 deletions