summaryrefslogtreecommitdiff
path: root/diff.h
AgeCommit message (Expand)Author
2020-09-29Merge branch 'tb/bloom-improvements'Junio C Hamano
2020-09-17bloom/diff: properly short-circuit on max_changesDerrick Stolee
2020-09-08diff-lib: tighten show_interdiff()'s interfaceEric Sunshine
2020-09-08diff: move show_interdiff() from its own file to diff-libEric Sunshine
2020-06-08diff.h: drop diff_tree_oid() & friends' return valueSZEDER Gábor
2020-03-30diff: halt tree-diff early after max_changesDerrick Stolee
2019-12-16Merge branch 'hw/doc-in-header'Junio C Hamano
2019-11-18diff: move doc to diff.h and diffcore.hHeba Waly
2019-11-14diff: export diffstat interfaceDaniel Ferreira
2019-08-19patch-id: convert to use the_hash_algobrian m. carlson
2019-07-11range-diff: suppress line count in outer diffThomas Gummerer
2019-06-13Merge branch 'sb/format-patch-base-patch-id-fix'Junio C Hamano
2019-05-30Merge branch 'nd/diff-parseopt'Junio C Hamano
2019-05-29diff-parseopt: correct variable types that are used by parseoptNguyễn Thái Ngọc Duy
2019-05-08format-patch: make --base patch-id output stableStephen Boyd
2019-04-25Merge branch 'nd/diff-parseopt-4'Junio C Hamano
2019-03-24am: avoid diff_opt_parse()Nguyễn Thái Ngọc Duy
2019-03-24diff --no-index: use parse_options() instead of diff_opt_parse()Nguyễn Thái Ngọc Duy
2019-03-07Merge branch 'jk/diff-no-index-initialize'Junio C Hamano
2019-03-07Merge branch 'jk/unused-params'Junio C Hamano
2019-03-07Merge branch 'en/combined-all-paths'Junio C Hamano
2019-02-24diff: reuse diff setup for --no-index caseJeff King
2019-02-14diff: drop options parameter from diffcore_fix_diff_index()Jeff King
2019-02-08log,diff-tree: add --combined-all-paths optionElijah Newren
2019-01-28diff.c: prepare to use parse_options() for parsingNguyễn Thái Ngọc Duy
2019-01-28diff.h: avoid bit fields in struct diff_flagsNguyễn Thái Ngọc Duy
2019-01-28diff.h: keep forward struct declarations sortedNguyễn Thái Ngọc Duy
2019-01-14Merge branch 'sb/diff-color-moved-config-option-fixup'Junio C Hamano
2018-11-14diff: align move detection error handling with other optionsStefan Beller
2018-11-12notes-cache.c: remove the_repository referencesNguyễn Thái Ngọc Duy
2018-11-12diff-lib.c: remove the_repository referencesNguyễn Thái Ngọc Duy
2018-10-19Merge branch 'nd/the-index'Junio C Hamano
2018-09-21userdiff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-09-21diff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-09-21diff.c: remove the_index dependency in textconv() functionsNguyễn Thái Ngọc Duy
2018-09-21diff.c: reduce implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-09-17Merge branch 'sb/range-diff-colors'Junio C Hamano
2018-08-20diff.c: add --output-indicator-{new, old, context}Stefan Beller
2018-08-20Merge branch 'js/range-diff'Junio C Hamano
2018-08-13diff.c: move read_index() code back to the callerNguyễn Thái Ngọc Duy
2018-08-13range-diff: use dim/bold cues to improve dual color modeJohannes Schindelin
2018-08-13diff: add an internal option to dual-color diffs of diffsJohannes Schindelin
2018-08-13range-diff: suppress the diff headersJohannes Schindelin
2018-08-03diff.h: remove extern from function declarationNguyễn Thái Ngọc Duy
2018-08-02Merge branch 'sb/diff-color-move-more'Junio C Hamano
2018-07-19diff.c: add white space mode to move detection that allows indent changesStefan Beller
2018-07-17diff.c: decouple white space treatment from move detection algorithmStefan Beller
2018-07-17diff.c: add a blocks mode for moved code detectionStefan Beller
2018-05-08merge: add merge.renames config settingBen Peart
2018-03-14Merge branch 'nd/diff-stat-with-summary'Junio C Hamano