summaryrefslogtreecommitdiffstats
path: root/diff.h
AgeCommit message (Expand)AuthorLines
2018-05-08merge: add merge.renames config settingBen Peart-0/+1
2018-03-14Merge branch 'nd/diff-stat-with-summary'Junio C Hamano-0/+1
2018-02-27diff: add --compact-summaryNguyễn Thái Ngọc Duy-0/+1
2018-01-23Merge branch 'sb/diff-blobfind-pickaxe'Junio C Hamano-2/+11
2018-01-04diffcore: add a pickaxe option to find a specific blobStefan Beller-1/+7
2018-01-04diff: introduce DIFF_PICKAXE_KINDS_MASKStefan Beller-0/+2
2018-01-04diff: migrate diff_flags.pickaxe_ignore_case to a pickaxe_opts bitStefan Beller-1/+2
2018-01-04diff.h: make pickaxe_opts an unsigned bit fieldStefan Beller-1/+1
2017-11-28diff: support anchoring line(s)Jonathan Tan-0/+4
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano-39/+49
2017-11-06Merge branch 'jk/revision-pruning-optim'Junio C Hamano-0/+1
2017-11-01diff: make struct diff_flags members lowercaseBrandon Williams-31/+31
2017-11-01diff: remove DIFF_OPT_CLR macroBrandon Williams-2/+0
2017-11-01diff: remove DIFF_OPT_SET macroBrandon Williams-1/+0
2017-11-01diff: remove DIFF_OPT_TST macroBrandon Williams-1/+0
2017-11-01diff: remove touched flagsBrandon Williams-4/+2
2017-11-01diff: add flag to indicate textconv was set via cmdlineBrandon Williams-0/+1
2017-11-01diff: convert flags to be stored in bitfieldsBrandon Williams-39/+54
2017-10-14revision: quit pruning diff more quickly when possibleJeff King-0/+1
2017-08-16diff: define block by number of alphanumeric charsJonathan Tan-1/+1
2017-06-30diff.c: add dimming to moved line detectionStefan Beller-2/+7
2017-06-30diff.c: color moved lines differently, plain modeStefan Beller-0/+1
2017-06-30diff.c: color moved lines differentlyStefan Beller-1/+11
2017-06-30diff.c: buffer all output if asked toStefan Beller-0/+2
2017-06-30diff.c: convert show_stats to use emit_diff_symbolStefan Beller-2/+2
2017-06-30submodule.c: migrate diff output to use emit_diff_symbolStefan Beller-0/+9
2017-06-30diff.c: migrate emit_line_checked to use emit_diff_symbolStefan Beller-3/+3
2017-06-19Merge branch 'bw/object-id'Junio C Hamano-19/+19
2017-06-05tree-diff: convert diff_tree_paths to struct object_idBrandon Williams-2/+2
2017-06-05diff-tree: convert diff_tree_sha1 to struct object_idBrandon Williams-2/+3
2017-06-05Merge branch 'js/blame-lib'Junio C Hamano-0/+7
2017-06-02tree-diff: convert diff_root_tree_sha1 to struct object_idBrandon Williams-2/+2
2017-06-02combine-diff: convert diff_tree_combined to struct object_idBrandon Williams-1/+1
2017-06-02diff: convert diff_flush_patch_id to struct object_idBrandon Williams-1/+1
2017-06-02diff: convert diff_change to struct object_idBrandon Williams-7/+6
2017-06-02diff: convert diff_addremove to struct object_idBrandon Williams-4/+4
2017-05-24blame: move textconv_object with related functionsJeff Smith-0/+7
2017-05-08diff-lib: convert do_diff_cache to struct object_idbrian m. carlson-1/+1
2017-03-31Rename sha1_array to oid_arraybrian m. carlson-2/+2
2016-10-27Merge branch 'nd/ita-empty-commit'Junio C Hamano-1/+2
2016-10-26diff_aligned_abbrev: use "struct oid"Jeff King-1/+1
2016-10-26diff_unique_abbrev: rename to diff_aligned_abbrevJeff King-1/+5
2016-10-24commit: fix empty commit creation when there's no changes but ita entriesNguyễn Thái Ngọc Duy-1/+1
2016-10-24diff-lib: allow ita entries treated as "not yet exist in index"Nguyễn Thái Ngọc Duy-0/+1
2016-09-26Merge branch 'mh/diff-indent-heuristic'Junio C Hamano-0/+1
2016-09-19blame: honor the diff heuristic options and configMichael Haggerty-0/+1
2016-09-12Merge branch 'jk/diff-submodule-diff-inline'Junio C Hamano-2/+9
2016-08-31diff: teach diff to display submodule difference with an inline diffJacob Keller-1/+2
2016-08-31diff: prepare for additional submodule formatsJacob Keller-1/+6
2016-08-31graph: add support for --line-prefix on all graph-aware outputJacob Keller-0/+2