summaryrefslogtreecommitdiff
path: root/builtin/diff-files.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-08-18 12:29:47 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-08-18 12:29:47 -0700
commit06d11b2e8d9d78d01212024f0f410e4193cbb5bd (patch)
treeb0deab7259afb582a269aadce0547a5f9ee18b44 /builtin/diff-files.c
parentMerge branch 'jn/fix-abbrev' (diff)
parentrebase: support -X to pass through strategy options (diff)
downloadtgif-06d11b2e8d9d78d01212024f0f410e4193cbb5bd.tar.xz
Merge branch 'ml/rebase-x-strategy'
* ml/rebase-x-strategy: rebase: support -X to pass through strategy options
Diffstat (limited to 'builtin/diff-files.c')
0 files changed, 0 insertions, 0 deletions