aboutsummaryrefslogtreecommitdiffstats
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
2022-04-20diff: use mks_tempfile_dt()René Scharfe1-7/+1
2022-03-23Merge branch 'ab/plug-random-leaks'Junio C Hamano1-2/+9
2022-03-17diff.c: fix a double-free regression in a18d66cefbÆvar Arnfjörð Bjarmason1-2/+9
2022-03-13Merge branch 'ab/plug-random-leaks'Junio C Hamano1-0/+1
2022-03-06Merge branch 'ac/usage-string-fixups'Junio C Hamano1-1/+1
2022-03-04diff.c: free "buf" in diff_words_flush()Ævar Arnfjörð Bjarmason1-0/+1
2022-02-25Merge branch 'ab/diff-free-more'Junio C Hamano1-0/+2
2022-02-23amend remaining usage strings according to style guideAbhradeep Chakraborty1-1/+1
2022-02-16Merge branch 'js/diff-filter-negation-fix'Junio C Hamano1-53/+44
2022-02-16Merge branch 'en/remerge-diff'Junio C Hamano1-4/+120
2022-02-16diff.[ch]: have diff_free() free options->parseoptsÆvar Arnfjörð Bjarmason1-0/+1
2022-02-16diff.[ch]: have diff_free() call clear_pathspec(opts.pathspec)Ævar Arnfjörð Bjarmason1-0/+1
2022-02-02diff: add ability to insert additional headers for pathsElijah Newren1-4/+120
2022-01-28diff-filter: be more careful when looking for negative bitsJohannes Schindelin1-16/+7
2022-01-28diff.c: move the diff filter bits definitions up a bitJohannes Schindelin1-37/+37
2022-01-10Merge branch 'ja/i18n-similar-messages'Junio C Hamano1-4/+8
2022-01-05Merge branch 'pw/diff-color-moved-fix'Junio C Hamano1-245/+186
2022-01-05i18n: turn even more messages into "cannot be used together" onesJean-Noël Avila1-4/+8
2022-01-05i18n: refactor "%s, %s and %s are mutually exclusive"Jean-Noël Avila1-1/+1
2021-12-09diff --color-moved: intern stringsPhillip Wood1-78/+96
2021-12-09diff: use designated initializers for emitted_diff_symbolPhillip Wood1-1/+3
2021-12-09diff --color-moved-ws=allow-indentation-change: improve hash lookupsPhillip Wood1-46/+19
2021-12-09diff --color-moved: stop clearing potential moved blocksPhillip Wood1-11/+0
2021-12-09diff --color-moved: shrink potential moved blocks as we goPhillip Wood1-36/+8
2021-12-09diff --color-moved: unify moved block growth functionsPhillip Wood1-29/+12
2021-12-09diff --color-moved: call comparison function directlyPhillip Wood1-4/+7
2021-12-09diff --color-moved-ws=allow-indentation-change: simplify and optimizePhillip Wood1-50/+20
2021-12-09diff: simplify allow-indentation-change delta calculationPhillip Wood1-11/+2
2021-12-09diff --color-moved: avoid false short line matches and bad zebra coloringPhillip Wood1-6/+11
2021-12-09diff --color-moved=zebra: fix alternate coloringPhillip Wood1-2/+2
2021-12-09diff --color-moved: rewind when discarding pmbPhillip Wood1-5/+23
2021-12-09diff --color-moved: factor out functionPhillip Wood1-17/+34
2021-12-09diff --color-moved: clear all flags on blocks that are too shortPhillip Wood1-3/+3
2021-11-25run-command API users: use strvec_push(), not argv constructionÆvar Arnfjörð Bjarmason1-6/+2
2021-09-27*.[ch] *_INIT macros: use { 0 } for a "zero out" idiomÆvar Arnfjörð Bjarmason1-2/+2
2021-09-09diff: ignore sparse paths in diffstatDerrick Stolee1-0/+8
2021-08-06Merge branch 'ab/pickaxe-pcre2'Junio C Hamano1-1/+1
2021-08-04diff: --pickaxe-all typofixBagas Sanjaya1-1/+1
2021-07-28Merge branch 'en/rename-limits-doc'Junio C Hamano1-2/+2
2021-07-15rename: bump limit defaults yet againElijah Newren1-1/+1
2021-07-15diff: correct warning message when renameLimit exceededElijah Newren1-1/+1
2021-07-13Merge branch 'ab/pickaxe-pcre2'Junio C Hamano1-14/+25
2021-05-14Merge branch 'pw/word-diff-zero-width-matches'Junio C Hamano1-3/+7
2021-05-11xdiff-interface: replace discard_hunk_line() with a flagÆvar Arnfjörð Bjarmason1-3/+4
2021-05-11xdiff-interface: prepare for allowing early returnÆvar Arnfjörð Bjarmason1-11/+15
2021-05-11pickaxe: die when --find-object and --pickaxe-all are combinedÆvar Arnfjörð Bjarmason1-0/+3
2021-05-11pickaxe: die when -G and --pickaxe-regex are combinedÆvar Arnfjörð Bjarmason1-0/+3
2021-05-05word diff: handle zero length matchesPhillip Wood1-3/+7
2021-04-27hash: provide per-algorithm null OIDsbrian m. carlson1-2/+2
2021-04-27Use the final_oid_fn to finalize hashing of object IDsbrian m. carlson1-1/+1
2021-03-13use CALLOC_ARRAYRené Scharfe1-6/+4
2021-02-25Merge branch 'jc/diffcore-rotate'Junio C Hamano1-0/+21
2021-02-16diff: --{rotate,skip}-to=<path>Junio C Hamano1-0/+21
2021-02-11diff: plug memory leak from regcomp() on {log,diff} -IÆvar Arnfjörð Bjarmason1-0/+12
2021-02-11diff: add an API for deferred freeingÆvar Arnfjörð Bjarmason1-4/+16
2021-01-25Merge branch 'sj/untracked-files-in-submodule-directory-is-not-dirty'Junio C Hamano1-0/+3
2020-12-18Merge branch 'jc/diff-I-status-fix'Junio C Hamano1-1/+2
2020-12-16diff: correct interaction between --exit-code and -I<pattern>Junio C Hamano1-1/+2
2020-12-08diff: do not show submodule with untracked files as "-dirty"Sangeeta Jain1-0/+3
2020-11-21Merge branch 'en/strmap'Junio C Hamano1-2/+2
2020-11-21Merge branch 'jk/diff-release-filespec-fix'Junio C Hamano1-0/+3
2020-11-06diff: allow passing NULL to diff_free_filespec_data()Jinoh Kang1-0/+3
2020-11-02Merge branch 'mk/diff-ignore-regex'Junio C Hamano1-0/+23
2020-11-02hashmap: provide deallocation function namesElijah Newren1-2/+2
2020-10-20diff: add -I<regex> that ignores matching changesMichał Kępień1-0/+23
2020-09-24diff: fix modified lines stats with --stat and --numstatThomas Guyot-Sionnest1-5/+7
2020-09-18Merge branch 'jc/quote-path-cleanup'Junio C Hamano1-4/+4
2020-09-10quote: turn 'nodq' parameter into a set of flagsJunio C Hamano1-4/+4
2020-09-09Merge branch 'ss/submodule-summary-in-c'Junio C Hamano1-1/+1
2020-09-03Merge branch 'mr/diff-hide-stat-wo-textual-change'Junio C Hamano1-7/+31
2020-08-31Merge branch 'dd/diff-customize-index-line-abbrev'Junio C Hamano1-1/+4
2020-08-24Merge branch 'rs/patch-id-with-incomplete-line'Junio C Hamano1-0/+2
2020-08-21diff: index-line: respect --abbrev in object's nameĐoàn Trần Công Danh1-1/+4
2020-08-19diff: teach --stat to ignore uninteresting modificationsMatthew Rogers1-7/+31
2020-08-18patch-id: ignore newline at end of file in diff_flush_patch_id()René Scharfe1-0/+2
2020-08-12submodule: rename helper functions to avoid ambiguityShourya Shukla1-1/+1
2020-07-30strvec: rename struct fieldsJeff King1-1/+1
2020-07-28strvec: convert more callers away from argv_array nameJeff King1-14/+14
2020-07-28strvec: rename files from argv-array to strvecJeff King1-1/+1
2020-06-17Merge branch 'jk/diff-memuse-optim-with-stat-unmatch'Junio C Hamano1-1/+4
2020-06-02diff: discard blob data from stat-unmatched pairsJeff King1-1/+4
2020-05-24diff: add config option relativeLaurent Arnoud1-3/+8
2020-04-28Merge branch 'jt/avoid-prefetch-when-able-in-diff'Junio C Hamano1-50/+107
2020-04-07diff: restrict when prefetching occursJonathan Tan1-22/+51
2020-04-07diff: refactor object readJonathan Tan1-8/+21
2020-04-07diff: make diff_populate_filespec_options structJonathan Tan1-19/+35
2020-04-02promisor-remote: accept 0 as oid_nr in functionJonathan Tan1-6/+5
2020-03-16convert: provide additional metadata to filtersbrian m. carlson1-1/+4
2020-03-16convert: permit passing additional metadata to filter processesbrian m. carlson1-1/+1
2020-02-14Merge branch 'mt/use-passed-repo-more-in-funcs'Junio C Hamano1-1/+1
2020-01-31diff: move diff.wsErrorHighlight to "basic" configJeff King1-8/+8
2020-01-31diff: make diff_populate_filespec() honor its repo argumentMatheus Tavares1-1/+1
2019-12-05Merge branch 'js/builtin-add-i'Junio C Hamano1-23/+16
2019-11-14diff: export diffstat interfaceDaniel Ferreira1-23/+16
2019-11-10Fix spelling errors in code commentsElijah Newren1-2/+2
2019-10-15Merge branch 'ew/hashmap'Junio C Hamano1-13/+18
2019-10-11Merge branch 'bc/object-id-part17'Junio C Hamano1-23/+23
2019-10-07hashmap: remove type arg from hashmap_{get,put,remove}_entryEric Wong1-4/+2
2019-10-07OFFSETOF_VAR macro to simplify hashmap iteratorsEric Wong1-3/+2
2019-10-07hashmap: introduce hashmap_free_entriesEric Wong1-2/+4
2019-10-07hashmap_cmp_fn takes hashmap_entry paramsEric Wong1-5/+7
2019-10-07hashmap: use *_entry APIs to wrap container_ofEric Wong1-12/+9
2019-10-07hashmap_get_next returns "struct hashmap_entry *"Eric Wong1-7/+12
2019-10-07hashmap_get takes "const struct hashmap_entry *"Eric Wong1-2/+2
2019-10-07hashmap_add takes "struct hashmap_entry *"Eric Wong1-1/+1
2019-10-07hashmap_get_next takes "const struct hashmap_entry *"Eric Wong1-2/+3
2019-10-07diff: use hashmap_entry_init on moved_entry.entEric Wong1-1/+2
2019-09-18Merge branch 'cc/multi-promisor'Junio C Hamano1-5/+4
2019-09-09Merge branch 'jt/diff-lazy-fetch-submodule-fix'Junio C Hamano1-0/+1
2019-08-20diff: skip GITLINK when lazy fetching missing objsJonathan Tan1-0/+1
2019-08-19patch-id: convert to use the_hash_algobrian m. carlson1-23/+23
2019-07-29Merge branch 'js/unmap-before-ext-diff' into maintJunio C Hamano1-0/+2
2019-07-25Merge branch 'js/unmap-before-ext-diff'Junio C Hamano1-0/+2
2019-07-11range-diff: suppress line count in outer diffThomas Gummerer1-1/+4
2019-07-11diff: munmap() file contents before running external diffJohannes Schindelin1-0/+2
2019-06-25Use promisor_remote_get_direct() and has_promisor_remote()Christian Couder1-5/+4
2019-06-13Merge branch 'sb/format-patch-base-patch-id-fix'Junio C Hamano1-5/+27
2019-06-03i18n: fix typos found during l10n for git 2.22.0Jiang Xin1-1/+1
2019-05-30Merge branch 'ja/diff-opt-typofix'Junio C Hamano1-2/+2
2019-05-30Merge branch 'nd/diff-parseopt'Junio C Hamano1-4/+6
2019-05-29diff-parseopt: restore -U (no argument) behaviorNguyễn Thái Ngọc Duy1-4/+6
2019-05-19diff: fix mistake in translatable stringsJean-Noël Avila1-2/+2
2019-05-08format-patch: make --base patch-id output stableStephen Boyd1-5/+27
2019-04-25Merge branch 'jt/batch-fetch-blobs-in-diff'Junio C Hamano1-0/+34
2019-04-25Merge branch 'nd/diff-parseopt-4'Junio C Hamano1-171/+168
2019-04-16Merge branch 'nd/diff-parseopt-3'Junio C Hamano1-114/+228
2019-04-08diff: batch fetching of missing blobsJonathan Tan1-0/+34
2019-03-24am: avoid diff_opt_parse()Nguyễn Thái Ngọc Duy1-0/+6
2019-03-24diff.c: allow --no-color-moved-wsNguyễn Thái Ngọc Duy1-2/+6
2019-03-24diff-parseopt: convert --color-moved-wsNguyễn Thái Ngọc Duy1-17/+18
2019-03-24diff-parseopt: convert --[no-]color-movedNguyễn Thái Ngọc Duy1-13/+25
2019-03-24diff-parseopt: convert --inter-hunk-contextNguyễn Thái Ngọc Duy1-47/+3
2019-03-24diff-parseopt: convert --no-prefixNguyễn Thái Ngọc Duy1-2/+15
2019-03-24diff-parseopt: convert --line-prefixNguyễn Thái Ngọc Duy1-8/+15
2019-03-24diff-parseopt: convert --[src|dst]-prefixNguyễn Thái Ngọc Duy1-8/+6
2019-03-24diff-parseopt: convert --[no-]abbrevNguyễn Thái Ngọc Duy1-11/+1
2019-03-24diff-parseopt: convert --diff-filterNguyễn Thái Ngọc Duy1-9/+9
2019-03-24diff-parseopt: convert --find-objectNguyễn Thái Ngọc Duy1-5/+9
2019-03-24diff-parseopt: convert -ONguyễn Thái Ngọc Duy1-20/+3
2019-03-24diff-parseopt: convert --pickaxe-all|--pickaxe-regexNguyễn Thái Ngọc Duy1-4/+6
2019-03-24diff-parseopt: convert -S|-GNguyễn Thái Ngọc Duy1-9/+28
2019-03-24diff-parseopt: convert -lNguyễn Thái Ngọc Duy1-4/+2
2019-03-24diff-parseopt: convert -zNguyễn Thái Ngọc Duy1-2/+3
2019-03-24diff-parseopt: convert --ita-[in]visible-in-indexNguyễn Thái Ngọc Duy1-4/+7
2019-03-24diff-parseopt: convert --ws-error-highlightNguyễn Thái Ngọc Duy1-10/+12
2019-03-07Merge branch 'nd/diff-parseopt-2'Junio C Hamano1-211/+299
2019-03-07Merge branch 'nd/completion-more-parameters'Junio C Hamano1-0/+8
2019-03-07Merge branch 'jk/unused-params'Junio C Hamano1-19/+12
2019-03-07Merge branch 'nd/diff-parseopt'Junio C Hamano1-12/+59
2019-03-07diff-parseopt: convert --submoduleNguyễn Thái Ngọc Duy1-11/+19
2019-03-07diff-parseopt: convert --ignore-submodulesNguyễn Thái Ngọc Duy1-3/+17
2019-03-07diff-parseopt: convert --textconvNguyễn Thái Ngọc Duy1-6/+19
2019-03-07diff-parseopt: convert --ext-diffNguyễn Thái Ngọc Duy1-5/+3
2019-03-07diff-parseopt: convert --quietNguyễn Thái Ngọc Duy1-3/+3
2019-03-07diff-parseopt: convert --exit-codeNguyễn Thái Ngọc Duy1-3/+3
2019-03-07diff-parseopt: convert --color-wordsNguyễn Thái Ngọc Duy1-5/+16
2019-03-07diff-parseopt: convert --word-diff-regexNguyễn Thái Ngọc Duy1-6/+15
2019-03-07diff-parseopt: convert --word-diffNguyễn Thái Ngọc Duy1-18/+29
2019-03-07diff-parseopt: convert --[no-]colorNguyễn Thái Ngọc Duy1-9/+3
2019-03-07diff-parseopt: convert --[no-]followNguyễn Thái Ngọc Duy1-6/+19
2019-03-07diff-parseopt: convert -RNguyễn Thái Ngọc Duy1-3/+3
2019-03-07diff-parseopt: convert -a|--textNguyễn Thái Ngọc Duy1-3/+3
2019-03-07diff-parseopt: convert --full-indexNguyễn Thái Ngọc Duy1-3/+3
2019-03-07diff-parseopt: convert --binaryNguyễn Thái Ngọc Duy1-5/+16
2019-03-07diff-parseopt: convert --anchoredNguyễn Thái Ngọc Duy1-9/+17
2019-03-07diff-parseopt: convert --diff-algorithmNguyễn Thái Ngọc Duy1-11/+22
2019-03-07diff-parseopt: convert --histogramNguyễn Thái Ngọc Duy1-3/+4
2019-03-07diff-parseopt: convert --patienceNguyễn Thái Ngọc Duy1-12/+25
2019-03-07diff-parseopt: convert --[no-]indent-heuristicNguyễn Thái Ngọc Duy1-5/+4
2019-02-21diff-parseopt: convert --ignore-some-changesNguyễn Thái Ngọc Duy1-11/+16
2019-02-21diff-parseopt: convert --[no-]minimalNguyễn Thái Ngọc Duy1-5/+6
2019-02-21diff-parseopt: convert --relativeNguyễn Thái Ngọc Duy1-8/+17
2019-02-21diff-parseopt: convert --no-renames|--[no--rename-emptyNguyễn Thái Ngọc Duy1-7/+6
2019-02-21diff-parseopt: convert --find-copies-harderNguyễn Thái Ngọc Duy1-2/+2
2019-02-21diff-parseopt: convert -C|--find-copiesNguyễn Thái Ngọc Duy1-34/+25
2019-02-21diff-parseopt: convert -D|--irreversible-deleteNguyễn Thái Ngọc Duy1-4/+4
2019-02-21diff-parseopt: convert -M|--find-renamesNguyễn Thái Ngọc Duy1-12/+23
2019-02-21diff-parseopt: convert -B|--break-rewritesNguyễn Thái Ngọc Duy1-26/+36
2019-02-21diff-parseopt: convert --output-*Nguyễn Thái Ngọc Duy1-18/+53
2019-02-21diff-parseopt: convert --[no-]compact-summaryNguyễn Thái Ngọc Duy1-6/+19
2019-02-21diff-parseopt: convert --stat*Nguyễn Thái Ngọc Duy1-66/+52
2019-02-21diff-parseopt: convert -s|--no-patchNguyễn Thái Ngọc Duy1-3/+4
2019-02-21diff-parseopt: convert --name-statusNguyễn Thái Ngọc Duy1-3/+4
2019-02-21diff-parseopt: convert --name-onlyNguyễn Thái Ngọc Duy1-3/+4
2019-02-21diff-parseopt: convert --patch-with-statNguyễn Thái Ngọc Duy1-4/+5
2019-02-21diff-parseopt: convert --summaryNguyễn Thái Ngọc Duy1-3/+4
2019-02-21diff-parseopt: convert --checkNguyễn Thái Ngọc Duy1-3/+4
2019-02-21diff-parseopt: convert --dirstat and friendsNguyễn Thái Ngọc Duy1-10/+29
2019-02-20diff-parseopt: convert --numstat and --shortstatNguyễn Thái Ngọc Duy1-5/+7
2019-02-20diff-parseopt: convert --patch-with-rawNguyễn Thái Ngọc Duy1-4/+5
2019-02-20completion: add more parameter value completionNguyễn Thái Ngọc Duy1-0/+8
2019-02-14diff: drop complete_rewrite parameter from run_external_diff()Jeff King1-3/+1
2019-02-14diff: drop unused emit data parameter from sane_truncate_line()Jeff King1-2/+2
2019-02-14diff: drop unused color reset parametersJeff King1-13/+8
2019-02-14diff: drop options parameter from diffcore_fix_diff_index()Jeff King1-1/+1
2019-02-05Merge branch 'jk/diff-cc-stat-fixes'Junio C Hamano1-1/+3
2019-01-29Merge branch 'jk/save-getenv-result'Junio C Hamano1-1/+4
2019-01-29Merge branch 'pw/diff-color-moved-ws-fix'Junio C Hamano1-78/+143
2019-01-29Merge branch 'kg/external-diff-save-env'Junio C Hamano1-1/+1
2019-01-27diff.c: convert --rawNguyễn Thái Ngọc Duy1-3/+4
generated by cgit 1.2.3-korg (git 2.43.0) at 2025-12-06 10:28:25 +0000