aboutsummaryrefslogtreecommitdiff
path: root/diff.h
Commit message (Expand)AuthorAge
* Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano2017-11-09
|\
| * diff: make struct diff_flags members lowercaseBrandon Williams2017-11-01
| * diff: remove DIFF_OPT_CLR macroBrandon Williams2017-11-01
| * diff: remove DIFF_OPT_SET macroBrandon Williams2017-11-01
| * diff: remove DIFF_OPT_TST macroBrandon Williams2017-11-01
| * diff: remove touched flagsBrandon Williams2017-11-01
| * diff: add flag to indicate textconv was set via cmdlineBrandon Williams2017-11-01
| * diff: convert flags to be stored in bitfieldsBrandon Williams2017-11-01
* | Merge branch 'jk/revision-pruning-optim'Junio C Hamano2017-11-06
|\ \ | |/ |/|
| * revision: quit pruning diff more quickly when possibleJeff King2017-10-14
* | diff: define block by number of alphanumeric charsJonathan Tan2017-08-16
* | diff.c: add dimming to moved line detectionStefan Beller2017-06-30
* | diff.c: color moved lines differently, plain modeStefan Beller2017-06-30
* | diff.c: color moved lines differentlyStefan Beller2017-06-30
* | diff.c: buffer all output if asked toStefan Beller2017-06-30
* | diff.c: convert show_stats to use emit_diff_symbolStefan Beller2017-06-30
* | submodule.c: migrate diff output to use emit_diff_symbolStefan Beller2017-06-30
* | diff.c: migrate emit_line_checked to use emit_diff_symbolStefan Beller2017-06-30
* | Merge branch 'bw/object-id'Junio C Hamano2017-06-19
|\ \
| * | tree-diff: convert diff_tree_paths to struct object_idBrandon Williams2017-06-05
| * | diff-tree: convert diff_tree_sha1 to struct object_idBrandon Williams2017-06-05
| * | tree-diff: convert diff_root_tree_sha1 to struct object_idBrandon Williams2017-06-02
| * | combine-diff: convert diff_tree_combined to struct object_idBrandon Williams2017-06-02
| * | diff: convert diff_flush_patch_id to struct object_idBrandon Williams2017-06-02
| * | diff: convert diff_change to struct object_idBrandon Williams2017-06-02
| * | diff: convert diff_addremove to struct object_idBrandon Williams2017-06-02
* | | Merge branch 'js/blame-lib'Junio C Hamano2017-06-05
|\ \ \ | |/ / |/| |
| * | blame: move textconv_object with related functionsJeff Smith2017-05-24
* | | diff-lib: convert do_diff_cache to struct object_idbrian m. carlson2017-05-08
|/ /
* | Rename sha1_array to oid_arraybrian m. carlson2017-03-31
|/
* Merge branch 'nd/ita-empty-commit'Junio C Hamano2016-10-27
|\
| * commit: fix empty commit creation when there's no changes but ita entriesNguyễn Thái Ngọc Duy2016-10-24
| * diff-lib: allow ita entries treated as "not yet exist in index"Nguyễn Thái Ngọc Duy2016-10-24
* | diff_aligned_abbrev: use "struct oid"Jeff King2016-10-26
* | diff_unique_abbrev: rename to diff_aligned_abbrevJeff King2016-10-26
|/
* Merge branch 'mh/diff-indent-heuristic'Junio C Hamano2016-09-26
|\
| * blame: honor the diff heuristic options and configMichael Haggerty2016-09-19
* | Merge branch 'jk/diff-submodule-diff-inline'Junio C Hamano2016-09-12
|\ \
| * | diff: teach diff to display submodule difference with an inline diffJacob Keller2016-08-31
| * | diff: prepare for additional submodule formatsJacob Keller2016-08-31
| * | graph: add support for --line-prefix on all graph-aware outputJacob Keller2016-08-31
| * | diff.c: remove output_prefix_length fieldJunio C Hamano2016-08-31
| |/
* | patch-ids: add flag to create the diff patch id using header only dataKevin Willford2016-07-29
|/
* Merge branch 'mm/diff-renames-default'Junio C Hamano2016-04-03
|\
| * diff: activate diff.renames by defaultMatthieu Moy2016-02-25
* | Merge branch 'jk/tighten-alloc'Junio C Hamano2016-02-26
|\ \
| * | tree-diff: catch integer overflow in combine_diff_path allocationJeff King2016-02-19
| * | Merge branch 'nd/diff-with-path-params' into maintJunio C Hamano2016-02-05
| |\ \
* | \ \ Merge branch 'jk/more-comments-on-textconv'Junio C Hamano2016-02-26
|\ \ \ \ | |_|_|/ |/| | |
| * | | diff: clarify textconv interfaceJeff King2016-02-22