summaryrefslogtreecommitdiffstats
path: root/diff.c
AgeCommit message (Expand)AuthorLines
2021-05-14Merge branch 'pw/word-diff-zero-width-matches'Junio C Hamano-3/+7
2021-05-05word diff: handle zero length matchesPhillip Wood-3/+7
2021-04-27hash: provide per-algorithm null OIDsbrian m. carlson-2/+2
2021-04-27Use the final_oid_fn to finalize hashing of object IDsbrian m. carlson-1/+1
2021-03-13use CALLOC_ARRAYRené Scharfe-6/+4
2021-02-25Merge branch 'jc/diffcore-rotate'Junio C Hamano-0/+21
2021-02-16diff: --{rotate,skip}-to=<path>Junio C Hamano-0/+21
2021-02-11diff: plug memory leak from regcomp() on {log,diff} -IÆvar Arnfjörð Bjarmason-0/+12
2021-02-11diff: add an API for deferred freeingÆvar Arnfjörð Bjarmason-4/+16
2021-01-25Merge branch 'sj/untracked-files-in-submodule-directory-is-not-dirty'Junio C Hamano-0/+3
2020-12-18Merge branch 'jc/diff-I-status-fix'Junio C Hamano-1/+2
2020-12-16diff: correct interaction between --exit-code and -I<pattern>Junio C Hamano-1/+2
2020-12-08diff: do not show submodule with untracked files as "-dirty"Sangeeta Jain-0/+3
2020-11-21Merge branch 'en/strmap'Junio C Hamano-2/+2
2020-11-21Merge branch 'jk/diff-release-filespec-fix'Junio C Hamano-0/+3
2020-11-06diff: allow passing NULL to diff_free_filespec_data()Jinoh Kang-0/+3
2020-11-02Merge branch 'mk/diff-ignore-regex'Junio C Hamano-0/+23
2020-11-02hashmap: provide deallocation function namesElijah Newren-2/+2
2020-10-20diff: add -I<regex> that ignores matching changesMichał Kępień-0/+23
2020-09-24diff: fix modified lines stats with --stat and --numstatThomas Guyot-Sionnest-5/+7
2020-09-18Merge branch 'jc/quote-path-cleanup'Junio C Hamano-4/+4
2020-09-10quote: turn 'nodq' parameter into a set of flagsJunio C Hamano-4/+4
2020-09-09Merge branch 'ss/submodule-summary-in-c'Junio C Hamano-1/+1
2020-09-03Merge branch 'mr/diff-hide-stat-wo-textual-change'Junio C Hamano-7/+31
2020-08-31Merge branch 'dd/diff-customize-index-line-abbrev'Junio C Hamano-1/+4
2020-08-24Merge branch 'rs/patch-id-with-incomplete-line'Junio C Hamano-0/+2
2020-08-21diff: index-line: respect --abbrev in object's nameĐoàn Trần Công Danh-1/+4
2020-08-19diff: teach --stat to ignore uninteresting modificationsMatthew Rogers-7/+31
2020-08-18patch-id: ignore newline at end of file in diff_flush_patch_id()René Scharfe-0/+2
2020-08-12submodule: rename helper functions to avoid ambiguityShourya Shukla-1/+1
2020-07-30strvec: rename struct fieldsJeff King-1/+1
2020-07-28strvec: convert more callers away from argv_array nameJeff King-14/+14
2020-07-28strvec: rename files from argv-array to strvecJeff King-1/+1
2020-06-17Merge branch 'jk/diff-memuse-optim-with-stat-unmatch'Junio C Hamano-1/+4
2020-06-02diff: discard blob data from stat-unmatched pairsJeff King-1/+4
2020-05-24diff: add config option relativeLaurent Arnoud-3/+8
2020-04-28Merge branch 'jt/avoid-prefetch-when-able-in-diff'Junio C Hamano-50/+107
2020-04-07diff: restrict when prefetching occursJonathan Tan-22/+51
2020-04-07diff: refactor object readJonathan Tan-8/+21
2020-04-07diff: make diff_populate_filespec_options structJonathan Tan-19/+35
2020-04-02promisor-remote: accept 0 as oid_nr in functionJonathan Tan-6/+5
2020-03-16convert: provide additional metadata to filtersbrian m. carlson-1/+4
2020-03-16convert: permit passing additional metadata to filter processesbrian m. carlson-1/+1
2020-02-14Merge branch 'mt/use-passed-repo-more-in-funcs'Junio C Hamano-1/+1
2020-01-31diff: move diff.wsErrorHighlight to "basic" configJeff King-8/+8
2020-01-31diff: make diff_populate_filespec() honor its repo argumentMatheus Tavares-1/+1
2019-12-05Merge branch 'js/builtin-add-i'Junio C Hamano-23/+16
2019-11-14diff: export diffstat interfaceDaniel Ferreira-23/+16
2019-11-10Fix spelling errors in code commentsElijah Newren-2/+2
2019-10-15Merge branch 'ew/hashmap'Junio C Hamano-13/+18