summaryrefslogtreecommitdiff
path: root/builtin/diff.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-01-10 10:32:42 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-01-10 10:32:42 -0800
commit2da5cbd651114569b1a25d9b73c0e2afffb30aa7 (patch)
tree3aa0ed6450b24d67c0f62e756412dc2cd25e992d /builtin/diff.c
parentMerge branch 'bc/log-decoration' (diff)
parentdiff: add diff.orderfile configuration variable (diff)
downloadtgif-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 'builtin/diff.c')
0 files changed, 0 insertions, 0 deletions