aboutsummaryrefslogtreecommitdiffstats
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
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
2019-01-27diff.c: convert -W|--[no-]function-contextNguyễn Thái Ngọc Duy1-6/+2
2019-01-27diff.c: convert -U|--unifiedNguyễn Thái Ngọc Duy1-3/+20
2019-01-27diff.c: convert -u|-p|--patchNguyễn Thái Ngọc Duy1-2/+8
2019-01-27diff.c: prepare to use parse_options() for parsingNguyễn Thái Ngọc Duy1-0/+27
2019-01-24diff: clear emitted_symbols flag after useJeff King1-1/+3
2019-01-18Merge branch 'nd/style-opening-brace'Junio C Hamano1-2/+4
2019-01-14Merge branch 'sb/diff-color-moved-config-option-fixup'Junio C Hamano1-9/+16
2019-01-11builtin_diff(): read $GIT_DIFF_OPTS closer to useJeff King1-1/+4
2019-01-11diff: ensure correct lifetime of external_diff_cmdKim Gybels1-1/+1
2019-01-10diff --color-moved-ws: handle blank linesPhillip Wood1-3/+31
2019-01-10diff --color-moved-ws: modify allow-indentation-changePhillip Wood1-58/+74
2019-01-10diff --color-moved-ws: optimize allow-indentation-changePhillip Wood1-8/+11
2019-01-10diff --color-moved=zebra: be stricter with color alternationPhillip Wood1-8/+19
2019-01-10diff --color-moved-ws: fix false positivesPhillip Wood1-6/+9
2019-01-10diff: allow --no-color-moved-wsPhillip Wood1-1/+5
2019-01-10Use "whitespace" consistentlyPhillip Wood1-1/+1
2019-01-04Merge branch 'nd/the-index'Junio C Hamano1-6/+6
2018-12-10style: the opening '{' of a function is in a separate lineNguyễn Thái Ngọc Duy1-2/+4
2018-11-21Merge branch 'js/diff-notice-has-drive-prefix' into maintJunio C Hamano1-2/+2
2018-11-19Merge branch 'tb/print-size-t-with-uintmax-format'Junio C Hamano1-1/+1
2018-11-14diff: align move detection error handling with other optionsStefan Beller1-9/+16
2018-11-13Merge branch 'jk/xdiff-interface'Junio C Hamano1-25/+23
2018-11-12Upcast size_t variables to uintmax_t when printingTorsten Bögershausen1-1/+1
2018-11-12notes-cache.c: remove the_repository referencesNguyễn Thái Ngọc Duy1-6/+6
2018-11-05diff: convert --check to use a hunk callbackJeff King1-8/+12
2018-11-05diff: use hunk callback for word-diffJeff King1-7/+5
2018-11-05diff: discard hunk headers for patch-ids earlierJeff King1-6/+2
2018-11-05diff: avoid generating unused hunk header linesJeff King1-2/+2
2018-11-02xdiff-interface: provide a separate consume callback for hunksJeff King1-10/+10
2018-10-30Merge branch 'js/diff-notice-has-drive-prefix'Junio C Hamano1-2/+2
2018-10-26Merge branch 'sb/diff-emit-line-ws-markup-cleanup'Junio C Hamano1-7/+5
2018-10-22diff: don't attempt to strip prefix from absolute Windows pathsJohannes Sixt1-2/+2
2018-10-19Merge branch 'pw/diff-color-moved-ws-fix'Junio C Hamano1-41/+54
2018-10-19Merge branch 'nd/the-index'Junio C Hamano1-113/+148
2018-10-12diff.c: pass sign_index to emit_line_ws_markupStefan Beller1-7/+5
2018-10-04diff --color-moved: fix a memory leakPhillip Wood1-2/+2
2018-10-04diff --color-moved-ws: fix another memory leakPhillip Wood1-0/+2
2018-10-04diff --color-moved-ws: fix a memory leakPhillip Wood1-1/+4
2018-10-04diff --color-moved-ws: fix out of bounds string accessPhillip Wood1-1/+1
2018-10-04diff --color-moved-ws: fix double free crashPhillip Wood1-37/+45
2018-09-24Merge branch 'sb/diff-color-move-more'Junio C Hamano1-5/+6
2018-09-21ws.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-3/+3
2018-09-21userdiff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-17/+23
2018-09-21sha1-file.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-10/+10
2018-09-21ll-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+1
2018-09-21diff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-2/+2
2018-09-21diff.c: remove the_index dependency in textconv() functionsNguyễn Thái Ngọc Duy1-8/+9
2018-09-21diff.c: reduce implicit dependency on the_indexNguyễn Thái Ngọc Duy1-74/+102
2018-09-17Merge branch 'jk/cocci'Junio C Hamano1-14/+9
2018-09-17Merge branch 'sb/range-diff-colors'Junio C Hamano1-41/+65
2018-09-11diff: fix --color-moved-ws=allow-indentation-changePhillip Wood1-5/+6
2018-08-29show_dirstat: simplify same-content checkJeff King1-8/+3
2018-08-29convert "oidcmp() != 0" to "!oideq()"Jeff King1-3/+3
2018-08-29convert "oidcmp() == 0" to oideq()Jeff King1-3/+3
2018-08-20diff.c: add --output-indicator-{new, old, context}Stefan Beller1-3/+18
2018-08-20Merge branch 'js/range-diff'Junio C Hamano1-16/+89
2018-08-20Merge branch 'nd/no-the-index'Junio C Hamano1-11/+1
2018-08-15Merge branch 'nd/i18n'Junio C Hamano1-2/+2
2018-08-15Merge branch 'es/diff-color-moved-fix'Junio C Hamano1-1/+3
2018-08-14diff.c: rewrite emit_line_0 more understandablyStefan Beller1-33/+40
2018-08-14diff.c: omit check for line prefix in emit_line_0Stefan Beller1-4/+1
2018-08-14diff: use emit_line_0 once per lineStefan Beller1-8/+8
2018-08-14diff.c: add set_sign to emit_line_0Stefan Beller1-9/+15
2018-08-14diff.c: reorder arguments for emit_line_ws_markupStefan Beller1-6/+6
2018-08-14diff.c: simplify caller of emit_line_0Stefan Beller1-2/+1
2018-08-13convert.c: remove an implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+1
2018-08-13diff.c: move read_index() code back to the callerNguyễn Thái Ngọc Duy1-10/+0
2018-08-13range-diff: use dim/bold cues to improve dual color modeJohannes Schindelin1-6/+22
2018-08-13range-diff --dual-color: skip white-space warningsJohannes Schindelin1-0/+1
2018-08-13diff: add an internal option to dual-color diffs of diffsJohannes Schindelin1-15/+68
2018-08-13range-diff: suppress the diff headersJohannes Schindelin1-1/+4
2018-08-02Merge branch 'sb/diff-color-move-more'Junio C Hamano1-26/+236
2018-08-02Merge branch 'bc/object-id'Junio C Hamano1-3/+3
2018-07-25diff: --color-moved: rename "dimmed_zebra" to "dimmed-zebra"Eric Sunshine1-1/+3
2018-07-23Update messages in preparation for i18nNguyễn Thái Ngọc Duy1-2/+2
2018-07-19diff.c: offer config option to control ws handling in move detectionStefan Beller1-0/+9
2018-07-19diff.c: add white space mode to move detection that allows indent changesStefan Beller1-2/+156
2018-07-18Merge branch 'sb/object-store-grafts'Junio C Hamano1-0/+1
2018-07-17diff.c: factor advance_or_nullify out of mark_color_as_movedStefan Beller1-12/+20
2018-07-17diff.c: decouple white space treatment from move detection algorithmStefan Beller1-2/+37
2018-07-17diff.c: add a blocks mode for moved code detectionStefan Beller1-2/+4
2018-07-17diff.c: adjust hash function signature to match hashmap expectationStefan Beller1-7/+9
2018-07-17diff.c: do not pass diff options as keydata to hashmapStefan Beller1-2/+2
2018-07-16diff: switch GIT_SHA1_HEXSZ to use the_hash_algobrian m. carlson1-3/+3
2018-06-25Merge branch 'nd/complete-config-vars'Junio C Hamano1-32/+24
2018-05-30Merge branch 'bc/object-id'Junio C Hamano1-7/+13
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-20 05:07:18 +0000