summaryrefslogtreecommitdiffstats
path: root/diff.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'en/rename-limits-doc'Junio C Hamano2021-07-281-2/+2
|\
| * rename: bump limit defaults yet againElijah Newren2021-07-151-1/+1
| * diff: correct warning message when renameLimit exceededElijah Newren2021-07-151-1/+1
* | Merge branch 'ab/pickaxe-pcre2'Junio C Hamano2021-07-131-14/+25
|\ \ | |/ |/|
| * xdiff-interface: replace discard_hunk_line() with a flagÆvar Arnfjörð Bjarmason2021-05-111-3/+4
| * xdiff-interface: prepare for allowing early returnÆvar Arnfjörð Bjarmason2021-05-111-11/+15
| * pickaxe: die when --find-object and --pickaxe-all are combinedÆvar Arnfjörð Bjarmason2021-05-111-0/+3
| * pickaxe: die when -G and --pickaxe-regex are combinedÆvar Arnfjörð Bjarmason2021-05-111-0/+3
* | Merge branch 'pw/word-diff-zero-width-matches'Junio C Hamano2021-05-141-3/+7
|\ \
| * | word diff: handle zero length matchesPhillip Wood2021-05-051-3/+7
| |/
* | hash: provide per-algorithm null OIDsbrian m. carlson2021-04-271-2/+2
* | Use the final_oid_fn to finalize hashing of object IDsbrian m. carlson2021-04-271-1/+1
|/
* use CALLOC_ARRAYRené Scharfe2021-03-131-6/+4
* Merge branch 'jc/diffcore-rotate'Junio C Hamano2021-02-251-0/+21
|\
| * diff: --{rotate,skip}-to=<path>Junio C Hamano2021-02-161-0/+21
* | diff: plug memory leak from regcomp() on {log,diff} -IÆvar Arnfjörð Bjarmason2021-02-111-0/+12
* | diff: add an API for deferred freeingÆvar Arnfjörð Bjarmason2021-02-111-4/+16
|/
* Merge branch 'sj/untracked-files-in-submodule-directory-is-not-dirty'Junio C Hamano2021-01-251-0/+3
|\
| * diff: do not show submodule with untracked files as "-dirty"Sangeeta Jain2020-12-081-0/+3
* | Merge branch 'jc/diff-I-status-fix'Junio C Hamano2020-12-181-1/+2
|\ \
| * | diff: correct interaction between --exit-code and -I<pattern>Junio C Hamano2020-12-161-1/+2
* | | Merge branch 'en/strmap'Junio C Hamano2020-11-211-2/+2
|\ \ \
| * | | hashmap: provide deallocation function namesElijah Newren2020-11-021-2/+2
| | |/ | |/|
* | | Merge branch 'jk/diff-release-filespec-fix'Junio C Hamano2020-11-211-0/+3
|\ \ \
| * | | diff: allow passing NULL to diff_free_filespec_data()Jinoh Kang2020-11-061-0/+3
| |/ /
* | | Merge branch 'mk/diff-ignore-regex'Junio C Hamano2020-11-021-0/+23
|\ \ \ | |/ / |/| / | |/
| * diff: add -I<regex> that ignores matching changesMichał Kępień2020-10-201-0/+23
* | diff: fix modified lines stats with --stat and --numstatThomas Guyot-Sionnest2020-09-241-5/+7
* | Merge branch 'jc/quote-path-cleanup'Junio C Hamano2020-09-181-4/+4
|\ \
| * | quote: turn 'nodq' parameter into a set of flagsJunio C Hamano2020-09-101-4/+4
* | | Merge branch 'ss/submodule-summary-in-c'Junio C Hamano2020-09-091-1/+1
|\ \ \ | |/ / |/| |
| * | submodule: rename helper functions to avoid ambiguityShourya Shukla2020-08-121-1/+1
* | | Merge branch 'mr/diff-hide-stat-wo-textual-change'Junio C Hamano2020-09-031-7/+31
|\ \ \
| * | | diff: teach --stat to ignore uninteresting modificationsMatthew Rogers2020-08-191-7/+31
| | |/ | |/|
* | | Merge branch 'dd/diff-customize-index-line-abbrev'Junio C Hamano2020-08-311-1/+4
|\ \ \
| * | | diff: index-line: respect --abbrev in object's nameĐoàn Trần Công Danh2020-08-211-1/+4
| | |/ | |/|
* | | Merge branch 'rs/patch-id-with-incomplete-line'Junio C Hamano2020-08-241-0/+2
|\ \ \ | |/ / |/| |
| * | patch-id: ignore newline at end of file in diff_flush_patch_id()René Scharfe2020-08-181-0/+2
| |/
* | strvec: rename struct fieldsJeff King2020-07-301-1/+1
* | strvec: convert more callers away from argv_array nameJeff King2020-07-281-14/+14
* | strvec: rename files from argv-array to strvecJeff King2020-07-281-1/+1
|/
* Merge branch 'jk/diff-memuse-optim-with-stat-unmatch'Junio C Hamano2020-06-171-1/+4
|\
| * diff: discard blob data from stat-unmatched pairsJeff King2020-06-021-1/+4
* | diff: add config option relativeLaurent Arnoud2020-05-241-3/+8
* | Merge branch 'jt/avoid-prefetch-when-able-in-diff'Junio C Hamano2020-04-281-50/+107
|\ \
| * | diff: restrict when prefetching occursJonathan Tan2020-04-071-22/+51
| * | diff: refactor object readJonathan Tan2020-04-071-8/+21
| * | diff: make diff_populate_filespec_options structJonathan Tan2020-04-071-19/+35
| * | promisor-remote: accept 0 as oid_nr in functionJonathan Tan2020-04-021-6/+5
| |/
* | convert: provide additional metadata to filtersbrian m. carlson2020-03-161-1/+4
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.