summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* 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
* | convert: permit passing additional metadata to filter processesbrian m. carlson2020-03-161-1/+1
|/
* Merge branch 'mt/use-passed-repo-more-in-funcs'Junio C Hamano2020-02-141-1/+1
|\
| * diff: make diff_populate_filespec() honor its repo argumentMatheus Tavares2020-01-311-1/+1
* | diff: move diff.wsErrorHighlight to "basic" configJeff King2020-01-311-8/+8
|/
* Merge branch 'js/builtin-add-i'Junio C Hamano2019-12-051-23/+16
|\
| * diff: export diffstat interfaceDaniel Ferreira2019-11-141-23/+16
* | Fix spelling errors in code commentsElijah Newren2019-11-101-2/+2
|/
* Merge branch 'ew/hashmap'Junio C Hamano2019-10-151-13/+18
|\
| * hashmap: remove type arg from hashmap_{get,put,remove}_entryEric Wong2019-10-071-4/+2
| * OFFSETOF_VAR macro to simplify hashmap iteratorsEric Wong2019-10-071-3/+2
| * hashmap: introduce hashmap_free_entriesEric Wong2019-10-071-2/+4
| * hashmap_cmp_fn takes hashmap_entry paramsEric Wong2019-10-071-5/+7
| * hashmap: use *_entry APIs to wrap container_ofEric Wong2019-10-071-12/+9
| * hashmap_get_next returns "struct hashmap_entry *"Eric Wong2019-10-071-7/+12
| * hashmap_get takes "const struct hashmap_entry *"Eric Wong2019-10-071-2/+2
| * hashmap_add takes "struct hashmap_entry *"Eric Wong2019-10-071-1/+1
| * hashmap_get_next takes "const struct hashmap_entry *"Eric Wong2019-10-071-2/+3
| * diff: use hashmap_entry_init on moved_entry.entEric Wong2019-10-071-1/+2
* | Merge branch 'bc/object-id-part17'Junio C Hamano2019-10-111-23/+23
|\ \
View Lorry Controller Status