summaryrefslogtreecommitdiff
path: root/daemon.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-08-16 11:23:24 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-08-16 11:23:24 -0700
commite10e476fb170a99ecc535a31def69d5e3483a859 (patch)
tree6987fb0785bcbdb69b5a7ad1ec5652df4a49b80c /daemon.c
parentam: refresh the index at start and --resolved (diff)
parentcombine-diff: respect textconv attributes (diff)
downloadtgif-e10e476fb170a99ecc535a31def69d5e3483a859.tar.xz
Merge branch 'jk/combine-diff-binary-etc' into maint
* jk/combine-diff-binary-etc: combine-diff: respect textconv attributes refactor get_textconv to not require diff_filespec combine-diff: handle binary files as binary combine-diff: calculate mode_differs earlier combine-diff: split header printing into its own function
Diffstat (limited to 'daemon.c')
0 files changed, 0 insertions, 0 deletions