summaryrefslogtreecommitdiff
path: root/tar.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-05-17 15:22:13 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-05-17 15:22:13 -0700
commit2e464dd5b220d4d2d8a16d5c43efe7af3c9adda9 (patch)
treee36a8a20733792bdcad789363fb0f50985123d11 /tar.h
parentMerge branch 'fc/git-complete-helper' (diff)
parentbuiltin/blame.c: Fix a "Using plain integer as NULL pointer" warning (diff)
downloadtgif-2e464dd5b220d4d2d8a16d5c43efe7af3c9adda9.tar.xz
Merge branch 'rs/xdiff-lose-emit-func'
Simplifies the interface between the implementation of "blame" and underlying xdiff engine, and removes a lot of unused or unnecessary code from the latter. By René Scharfe (6) and Ramsay Jones (1) * rs/xdiff-lose-emit-func: builtin/blame.c: Fix a "Using plain integer as NULL pointer" warning xdiff: remove unused functions xdiff: remove emit_func() and xdi_diff_hunks() blame: factor out helper for calling xdi_diff() blame: use hunk_func(), part 2 blame: use hunk_func(), part 1 xdiff: add hunk_func()
Diffstat (limited to 'tar.h')
0 files changed, 0 insertions, 0 deletions