summaryrefslogtreecommitdiffstats
path: root/diff.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sb/diff-color-moved-config-option-fixup'Junio C Hamano2019-01-141-1/+2
|\
| * diff: align move detection error handling with other optionsStefan Beller2018-11-141-1/+2
* | notes-cache.c: remove the_repository referencesNguyễn Thái Ngọc Duy2018-11-121-1/+1
* | diff-lib.c: remove the_repository referencesNguyễn Thái Ngọc Duy2018-11-121-1/+2
|/
* Merge branch 'nd/the-index'Junio C Hamano2018-10-191-5/+17
|\
| * userdiff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-1/+2
| * diff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-2/+5
| * diff.c: remove the_index dependency in textconv() functionsNguyễn Thái Ngọc Duy2018-09-211-2/+7
| * diff.c: reduce implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-0/+3
* | Merge branch 'sb/range-diff-colors'Junio C Hamano2018-09-171-0/+5
|\ \ | |/ |/|
| * diff.c: add --output-indicator-{new, old, context}Stefan Beller2018-08-201-0/+5
* | Merge branch 'js/range-diff'Junio C Hamano2018-08-201-1/+9
|\|
| * range-diff: use dim/bold cues to improve dual color modeJohannes Schindelin2018-08-131-1/+7
| * diff: add an internal option to dual-color diffs of diffsJohannes Schindelin2018-08-131-0/+1
| * range-diff: suppress the diff headersJohannes Schindelin2018-08-131-0/+1
* | diff.c: move read_index() code back to the callerNguyễn Thái Ngọc Duy2018-08-131-1/+0
* | diff.h: remove extern from function declarationNguyễn Thái Ngọc Duy2018-08-031-60/+60
|/
* Merge branch 'sb/diff-color-move-more'Junio C Hamano2018-08-021-2/+7
|\
| * diff.c: add white space mode to move detection that allows indent changesStefan Beller2018-07-191-0/+3
| * diff.c: decouple white space treatment from move detection algorithmStefan Beller2018-07-171-0/+1
| * diff.c: add a blocks mode for moved code detectionStefan Beller2018-07-171-2/+3
* | merge: add merge.renames config settingBen Peart2018-05-081-0/+1
|/
* Merge branch 'nd/diff-stat-with-summary'Junio C Hamano2018-03-141-0/+1
|\
| * diff: add --compact-summaryNguyễn Thái Ngọc Duy2018-02-271-0/+1
* | Merge branch 'sb/diff-blobfind-pickaxe'Junio C Hamano2018-01-231-2/+11
|\ \ | |/ |/|
| * diffcore: add a pickaxe option to find a specific blobStefan Beller2018-01-041-1/+7
| * diff: introduce DIFF_PICKAXE_KINDS_MASKStefan Beller2018-01-041-0/+2
| * diff: migrate diff_flags.pickaxe_ignore_case to a pickaxe_opts bitStefan Beller2018-01-041-1/+2
| * diff.h: make pickaxe_opts an unsigned bit fieldStefan Beller2018-01-041-1/+1
* | diff: support anchoring line(s)Jonathan Tan2017-11-281-0/+4
|/
* Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano2017-11-091-39/+49
|\
| * diff: make struct diff_flags members lowercaseBrandon Williams2017-11-011-31/+31
| * diff: remove DIFF_OPT_CLR macroBrandon Williams2017-11-011-2/+0
| * diff: remove DIFF_OPT_SET macroBrandon Williams2017-11-011-1/+0
| * diff: remove DIFF_OPT_TST macroBrandon Williams2017-11-011-1/+0
| * diff: remove touched flagsBrandon Williams2017-11-011-4/+2
| * diff: add flag to indicate textconv was set via cmdlineBrandon Williams2017-11-011-0/+1
| * diff: convert flags to be stored in bitfieldsBrandon Williams2017-11-011-39/+54
* | Merge branch 'jk/revision-pruning-optim'Junio C Hamano2017-11-061-0/+1
|\ \ | |/ |/|
| * revision: quit pruning diff more quickly when possibleJeff King2017-10-141-0/+1
* | diff: define block by number of alphanumeric charsJonathan Tan2017-08-161-1/+1
* | diff.c: add dimming to moved line detectionStefan Beller2017-06-301-2/+7
* | diff.c: color moved lines differently, plain modeStefan Beller2017-06-301-0/+1
* | diff.c: color moved lines differentlyStefan Beller2017-06-301-1/+11
* | diff.c: buffer all output if asked toStefan Beller2017-06-301-0/+2
* | diff.c: convert show_stats to use emit_diff_symbolStefan Beller2017-06-301-2/+2
* | submodule.c: migrate diff output to use emit_diff_symbolStefan Beller2017-06-301-0/+9
* | diff.c: migrate emit_line_checked to use emit_diff_symbolStefan Beller2017-06-301-3/+3
* | Merge branch 'bw/object-id'Junio C Hamano2017-06-191-19/+19
|\ \
| * | tree-diff: convert diff_tree_paths to struct object_idBrandon Williams2017-06-051-2/+2
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 01:18:33 +0000