summaryrefslogtreecommitdiff
path: root/diff.h
AgeCommit message (Expand)AuthorFilesLines
2018-05-08merge: add merge.renames config settingLibravatar Ben Peart1-0/+1
2018-03-14Merge branch 'nd/diff-stat-with-summary'Libravatar Junio C Hamano1-0/+1
2018-02-27diff: add --compact-summaryLibravatar Nguyễn Thái Ngọc Duy1-0/+1
2018-01-23Merge branch 'sb/diff-blobfind-pickaxe'Libravatar Junio C Hamano1-2/+11
2018-01-04diffcore: add a pickaxe option to find a specific blobLibravatar Stefan Beller1-1/+7
2018-01-04diff: introduce DIFF_PICKAXE_KINDS_MASKLibravatar Stefan Beller1-0/+2
2018-01-04diff: migrate diff_flags.pickaxe_ignore_case to a pickaxe_opts bitLibravatar Stefan Beller1-1/+2
2018-01-04diff.h: make pickaxe_opts an unsigned bit fieldLibravatar Stefan Beller1-1/+1
2017-11-28diff: support anchoring line(s)Libravatar Jonathan Tan1-0/+4
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Libravatar Junio C Hamano1-39/+49
2017-11-06Merge branch 'jk/revision-pruning-optim'Libravatar Junio C Hamano1-0/+1
2017-11-01diff: make struct diff_flags members lowercaseLibravatar Brandon Williams1-31/+31
2017-11-01diff: remove DIFF_OPT_CLR macroLibravatar Brandon Williams1-2/+0
2017-11-01diff: remove DIFF_OPT_SET macroLibravatar Brandon Williams1-1/+0
2017-11-01diff: remove DIFF_OPT_TST macroLibravatar Brandon Williams1-1/+0
2017-11-01diff: remove touched flagsLibravatar Brandon Williams1-4/+2
2017-11-01diff: add flag to indicate textconv was set via cmdlineLibravatar Brandon Williams1-0/+1
2017-11-01diff: convert flags to be stored in bitfieldsLibravatar Brandon Williams1-39/+54
2017-10-14revision: quit pruning diff more quickly when possibleLibravatar Jeff King1-0/+1
2017-08-16diff: define block by number of alphanumeric charsLibravatar Jonathan Tan1-1/+1
2017-06-30diff.c: add dimming to moved line detectionLibravatar Stefan Beller1-2/+7
2017-06-30diff.c: color moved lines differently, plain modeLibravatar Stefan Beller1-0/+1
2017-06-30diff.c: color moved lines differentlyLibravatar Stefan Beller1-1/+11
2017-06-30diff.c: buffer all output if asked toLibravatar Stefan Beller1-0/+2
2017-06-30diff.c: convert show_stats to use emit_diff_symbolLibravatar Stefan Beller1-2/+2
2017-06-30submodule.c: migrate diff output to use emit_diff_symbolLibravatar Stefan Beller1-0/+9
2017-06-30diff.c: migrate emit_line_checked to use emit_diff_symbolLibravatar Stefan Beller1-3/+3
2017-06-19Merge branch 'bw/object-id'Libravatar Junio C Hamano1-19/+19
2017-06-05tree-diff: convert diff_tree_paths to struct object_idLibravatar Brandon Williams1-2/+2
2017-06-05diff-tree: convert diff_tree_sha1 to struct object_idLibravatar Brandon Williams1-2/+3
2017-06-05Merge branch 'js/blame-lib'Libravatar Junio C Hamano1-0/+7
2017-06-02tree-diff: convert diff_root_tree_sha1 to struct object_idLibravatar Brandon Williams1-2/+2
2017-06-02combine-diff: convert diff_tree_combined to struct object_idLibravatar Brandon Williams1-1/+1
2017-06-02diff: convert diff_flush_patch_id to struct object_idLibravatar Brandon Williams1-1/+1
2017-06-02diff: convert diff_change to struct object_idLibravatar Brandon Williams1-7/+6
2017-06-02diff: convert diff_addremove to struct object_idLibravatar Brandon Williams1-4/+4
2017-05-24blame: move textconv_object with related functionsLibravatar Jeff Smith1-0/+7
2017-05-08diff-lib: convert do_diff_cache to struct object_idLibravatar brian m. carlson1-1/+1
2017-03-31Rename sha1_array to oid_arrayLibravatar brian m. carlson1-2/+2
2016-10-27Merge branch 'nd/ita-empty-commit'Libravatar Junio C Hamano1-1/+2
2016-10-26diff_aligned_abbrev: use "struct oid"Libravatar Jeff King1-1/+1
2016-10-26diff_unique_abbrev: rename to diff_aligned_abbrevLibravatar Jeff King1-1/+5
2016-10-24commit: fix empty commit creation when there's no changes but ita entriesLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2016-10-24diff-lib: allow ita entries treated as "not yet exist in index"Libravatar Nguyễn Thái Ngọc Duy1-0/+1
2016-09-26Merge branch 'mh/diff-indent-heuristic'Libravatar Junio C Hamano1-0/+1
2016-09-19blame: honor the diff heuristic options and configLibravatar Michael Haggerty1-0/+1
2016-09-12Merge branch 'jk/diff-submodule-diff-inline'Libravatar Junio C Hamano1-2/+9
2016-08-31diff: teach diff to display submodule difference with an inline diffLibravatar Jacob Keller1-1/+2
2016-08-31diff: prepare for additional submodule formatsLibravatar Jacob Keller1-1/+6
2016-08-31graph: add support for --line-prefix on all graph-aware outputLibravatar Jacob Keller1-0/+2