summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
2017-08-26Merge branch 'jt/diff-color-move-fix'Libravatar Junio C Hamano1-8/+39
2017-08-26Merge branch 'sb/diff-color-move'Libravatar Junio C Hamano1-252/+1057
2017-08-17diff: retire sane_truncate_fnLibravatar Junio C Hamano1-5/+0
2017-08-16diff: define block by number of alphanumeric charsLibravatar Jonathan Tan1-6/+22
2017-08-16diff: respect MIN_BLOCK_LENGTH for last blockLibravatar Jonathan Tan1-7/+22
2017-08-14diff: avoid redundantly clearing a flagLibravatar Jonathan Tan1-1/+1
2017-07-13color: check color.ui in git_default_config()Libravatar Jeff King1-3/+0
2017-07-12Merge branch 'rs/use-div-round-up'Libravatar Junio C Hamano1-1/+1
2017-07-10use DIV_ROUND_UPLibravatar René Scharfe1-1/+1
2017-06-30diff.c: add dimming to moved line detectionLibravatar Stefan Beller1-11/+121
2017-06-30diff.c: color moved lines differently, plain modeLibravatar Stefan Beller1-2/+8
2017-06-30diff.c: color moved lines differentlyLibravatar Stefan Beller1-14/+330
2017-06-30diff.c: buffer all output if asked toLibravatar Stefan Beller1-2/+107
2017-06-30diff.c: emit_diff_symbol learns about DIFF_SYMBOL_SUMMARYLibravatar Stefan Beller1-30/+41
2017-06-30diff.c: emit_diff_symbol learns about DIFF_SYMBOL_STAT_SEPLibravatar Stefan Beller1-3/+7
2017-06-30diff.c: convert word diffing to use emit_diff_symbolLibravatar Stefan Beller1-33/+46
2017-06-30diff.c: convert show_stats to use emit_diff_symbolLibravatar Stefan Beller1-42/+72
2017-06-30diff.c: convert emit_binary_diff_body to use emit_diff_symbolLibravatar Stefan Beller1-17/+46
2017-06-30submodule.c: migrate diff output to use emit_diff_symbolLibravatar Stefan Beller1-12/+71
2017-06-30diff.c: emit_diff_symbol learns DIFF_SYMBOL_REWRITE_DIFFLibravatar Stefan Beller1-14/+21
2017-06-30diff.c: emit_diff_symbol learns about DIFF_SYMBOL_BINARY_FILESLibravatar Stefan Beller1-5/+15
2017-06-30diff.c: emit_diff_symbol learns DIFF_SYMBOL_HEADERLibravatar Stefan Beller1-8/+20
2017-06-30diff.c: emit_diff_symbol learns DIFF_SYMBOL_FILEPAIR_{PLUS, MINUS}Libravatar Stefan Beller1-21/+30
2017-06-30diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_INCOMPLETELibravatar Stefan Beller1-2/+4
2017-06-30diff.c: emit_diff_symbol learns DIFF_SYMBOL_WORDS[_PORCELAIN]Libravatar Stefan Beller1-16/+26
2017-06-30diff.c: migrate emit_line_checked to use emit_diff_symbolLibravatar Stefan Beller1-41/+75
2017-06-30diff.c: emit_diff_symbol learns DIFF_SYMBOL_NO_LF_EOFLibravatar Stefan Beller1-8/+11
2017-06-30diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_FRAGINFOLibravatar Stefan Beller1-2/+6
2017-06-30diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_MARKERLibravatar Stefan Beller1-1/+9
2017-06-30diff.c: introduce emit_diff_symbolLibravatar Stefan Beller1-3/+19
2017-06-30diff.c: factor out diff_flush_patch_all_file_pairsLibravatar Stefan Beller1-5/+12
2017-06-30diff.c: move line ending check into emit_hunk_headerLibravatar Stefan Beller1-2/+2
2017-06-30diff.c: readability fixLibravatar Stefan Beller1-2/+2
2017-06-24Merge branch 'ab/free-and-null'Libravatar Junio C Hamano1-4/+2
2017-06-24Merge branch 'bw/config-h'Libravatar Junio C Hamano1-0/+1
2017-06-24Merge branch 'bw/ls-files-sans-the-index'Libravatar Junio C Hamano1-3/+3
2017-06-19Merge branch 'bw/object-id'Libravatar Junio C Hamano1-38/+38
2017-06-16coccinelle: make use of the "type" FREE_AND_NULL() ruleLibravatar Ævar Arnfjörð Bjarmason1-4/+2
2017-06-15config: don't include config.h by defaultLibravatar Brandon Williams1-0/+1
2017-06-13Merge branch 'nd/fopen-errors'Libravatar Junio C Hamano1-6/+2
2017-06-13convert: convert convert_to_git to take an indexLibravatar Brandon Williams1-3/+3
2017-06-05diff: rename diff_fill_sha1_info to diff_fill_oid_infoLibravatar Brandon Williams1-9/+9
2017-06-05Merge branch 'js/blame-lib'Libravatar Junio C Hamano1-0/+23
2017-06-05Merge branch 'mb/diff-default-to-indent-heuristics'Libravatar Junio C Hamano1-4/+4
2017-06-02diff: convert diff_flush_patch_id to struct object_idLibravatar Brandon Williams1-6/+6
2017-06-02diff: finish conversion for prepare_temp_file to struct object_idLibravatar Brandon Williams1-2/+2
2017-06-02diff: convert reuse_worktree_file to struct object_idLibravatar Brandon Williams1-5/+5
2017-06-02diff: convert fill_filespec to struct object_idLibravatar Brandon Williams1-8/+8
2017-06-02diff: convert diff_change to struct object_idLibravatar Brandon Williams1-7/+7
2017-06-02diff: convert diff_addremove to struct object_idLibravatar Brandon Williams1-4/+4