aboutsummaryrefslogtreecommitdiffstats
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
2017-06-30diff.c: emit_diff_symbol learns DIFF_SYMBOL_WORDS[_PORCELAIN]Stefan Beller1-16/+26
2017-06-30diff.c: migrate emit_line_checked to use emit_diff_symbolStefan Beller1-41/+75
2017-06-30diff.c: emit_diff_symbol learns DIFF_SYMBOL_NO_LF_EOFStefan Beller1-8/+11
2017-06-30diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_FRAGINFOStefan Beller1-2/+6
2017-06-30diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_MARKERStefan Beller1-1/+9
2017-06-30diff.c: introduce emit_diff_symbolStefan Beller1-3/+19
2017-06-30diff.c: factor out diff_flush_patch_all_file_pairsStefan Beller1-5/+12
2017-06-30diff.c: move line ending check into emit_hunk_headerStefan Beller1-2/+2
2017-06-30diff.c: readability fixStefan Beller1-2/+2
2017-06-24Merge branch 'ab/free-and-null'Junio C Hamano1-4/+2
2017-06-24Merge branch 'bw/config-h'Junio C Hamano1-0/+1
2017-06-24Merge branch 'bw/ls-files-sans-the-index'Junio C Hamano1-3/+3
2017-06-19Merge branch 'bw/object-id'Junio C Hamano1-38/+38
2017-06-16coccinelle: make use of the "type" FREE_AND_NULL() ruleÆvar Arnfjörð Bjarmason1-4/+2
2017-06-15config: don't include config.h by defaultBrandon Williams1-0/+1
2017-06-13Merge branch 'nd/fopen-errors'Junio C Hamano1-6/+2
2017-06-13convert: convert convert_to_git to take an indexBrandon Williams1-3/+3
2017-06-05diff: rename diff_fill_sha1_info to diff_fill_oid_infoBrandon Williams1-9/+9
2017-06-05Merge branch 'js/blame-lib'Junio C Hamano1-0/+23
2017-06-05Merge branch 'mb/diff-default-to-indent-heuristics'Junio C Hamano1-4/+4
2017-06-02diff: convert diff_flush_patch_id to struct object_idBrandon Williams1-6/+6
2017-06-02diff: finish conversion for prepare_temp_file to struct object_idBrandon Williams1-2/+2
2017-06-02diff: convert reuse_worktree_file to struct object_idBrandon Williams1-5/+5
2017-06-02diff: convert fill_filespec to struct object_idBrandon Williams1-8/+8
2017-06-02diff: convert diff_change to struct object_idBrandon Williams1-7/+7
2017-06-02diff: convert diff_addremove to struct object_idBrandon Williams1-4/+4
2017-05-29Merge branch 'bc/object-id'Junio C Hamano1-2/+2
2017-05-26use xfopen() in more placesNguyễn Thái Ngọc Duy1-6/+2
2017-05-24blame: move textconv_object with related functionsJeff Smith1-0/+23
2017-05-09diff: enable indent heuristic by defaultStefan Beller1-1/+1
2017-05-09diff: make the indent heuristic part of diff's basic configurationMarc Branchaud1-3/+3
2017-05-08notes-cache: convert to struct object_idbrian m. carlson1-2/+2
2017-05-01fix minor typosRené Genz1-1/+1
2017-04-19Merge branch 'bc/object-id'Junio C Hamano1-2/+2
2017-03-30diff: avoid fixed-size buffer for patch-idsJeff King1-31/+37
2017-03-26Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZbrian m. carlson1-2/+2
2017-03-21prefix_filename: return newly allocated stringJeff King1-3/+3
2017-03-21prefix_filename: drop length parameterJeff King1-2/+2
2017-03-12Merge branch 'jc/diff-populate-filespec-size-only-fix'Junio C Hamano1-1/+18
2017-03-02diff: do not short-cut CHECK_SIZE_ONLY check in diff_populate_filespec()Junio C Hamano1-1/+18
2017-02-15Merge branch 'rs/swap'Junio C Hamano1-8/+4
2017-02-10Merge branch 'jk/log-graph-name-only'Junio C Hamano1-0/+1
2017-02-08diff: print line prefix for --name-only outputJeff King1-0/+1
2017-01-30use oid_to_hex_r() for converting struct object_id hashes to hex stringsRené Scharfe1-1/+1
2017-01-30diff: use SWAP macroRené Scharfe1-3/+1
2017-01-30use SWAP macroRené Scharfe1-5/+3
2017-01-12diff: add interhunk context config optionVegard Nossum1-0/+8
2017-01-10Merge branch 'jc/retire-compaction-heuristics'Junio C Hamano1-20/+3
2016-12-23diff: retire "compaction" heuristicsJunio C Hamano1-20/+3
2016-12-08diff: handle --no-abbrev in no-index caseJack Bates1-1/+5
2016-11-29Merge branch 'tk/diffcore-delta-remove-unused' into maintJunio C Hamano1-1/+1
2016-11-17Merge branch 'tk/diffcore-delta-remove-unused'Junio C Hamano1-1/+1
2016-11-14diffcore-delta: remove unused parameter to diffcore_count_changes()Tobias Klauser1-1/+1
2016-10-28Merge branch 'rs/cocci' into maintJunio C Hamano1-1/+1
2016-10-27Merge branch 'nd/ita-empty-commit'Junio C Hamano1-0/+4
2016-10-27Merge branch 'jk/no-looking-at-dotgit-outside-repo'Junio C Hamano1-16/+29
2016-10-27Merge branch 'lt/abbrev-auto'Junio C Hamano1-1/+1
2016-10-26diff: handle sha1 abbreviations outside of repositoryJeff King1-4/+17
2016-10-26diff_aligned_abbrev: use "struct oid"Jeff King1-9/+11
2016-10-26diff_unique_abbrev: rename to diff_aligned_abbrevJeff King1-7/+3
2016-10-26Merge branch 'va/i18n'Junio C Hamano1-7/+7
2016-10-26Merge branch 'jc/ws-error-highlight'Junio C Hamano1-34/+55
2016-10-26Merge branch 'jc/diff-unique-abbrev-comments'Junio C Hamano1-1/+22
2016-10-24diff: add --ita-[in]visible-in-indexNguyễn Thái Ngọc Duy1-0/+4
2016-10-17i18n: diff: mark warnings for translationVasco Almeida1-7/+7
2016-10-10Merge branch 'rs/qsort'Junio C Hamano1-3/+3
2016-10-06Merge branch 'rs/cocci'Junio C Hamano1-1/+1
2016-10-04diff: introduce diff.wsErrorHighlight optionJunio C Hamano1-1/+10
2016-10-04diff.c: move ws-error-highlight parsing helpers upJunio C Hamano1-37/+37
2016-10-04diff.c: refactor parse_ws_error_highlight()Junio C Hamano1-5/+16
2016-10-03abbrev: prepare for new world orderJunio C Hamano1-1/+1
2016-09-30diff_unique_abbrev(): document its assumption and limitationJunio C Hamano1-1/+22
2016-09-29Merge branch 'js/regexec-buf' into maintJunio C Hamano1-1/+2
2016-09-29use QSORTRené Scharfe1-3/+3
2016-09-27use strbuf_add_unique_abbrev() for adding short hashes, part 2René Scharfe1-1/+1
2016-09-26Merge branch 'js/regexec-buf'Junio C Hamano1-1/+2
2016-09-26Merge branch 'va/i18n-more'Junio C Hamano1-5/+10
2016-09-26Merge branch 'mh/diff-indent-heuristic'Junio C Hamano1-7/+29
2016-09-21regex: use regexec_buf()Johannes Schindelin1-1/+2
2016-09-21i18n: i18n: diff: mark die messages for translationJean-Noël AVILA1-5/+10
2016-09-19Merge branch 'bc/object-id'Junio C Hamano1-1/+1
2016-09-19blame: honor the diff heuristic options and configMichael Haggerty1-12/+17
2016-09-19diff: improve positioning of add/delete blocks in diffsMichael Haggerty1-3/+20
2016-09-15Merge branch 'sb/diff-cleanup'Junio C Hamano1-21/+10
2016-09-12Merge branch 'jk/diff-submodule-diff-inline'Junio C Hamano1-17/+37
2016-09-08diff: remove dead codeStefan Beller1-8/+0
2016-09-08diff: omit found pointer from emit_callbackStefan Beller1-4/+2
2016-09-08diff.c: use diff_options directlyStefan Beller1-11/+10
2016-09-07cache: convert struct cache_entry to use struct object_idbrian m. carlson1-1/+1
2016-08-31diff: teach diff to display submodule difference with an inline diffJacob Keller1-9/+22
2016-08-31submodule: convert show_submodule_summary to use struct object_id *Jacob Keller1-1/+1
2016-08-31diff: prepare for additional submodule formatsJacob Keller1-6/+6
2016-08-31graph: add support for --line-prefix on all graph-aware outputJacob Keller1-0/+7
2016-08-31diff.c: remove output_prefix_length fieldJunio C Hamano1-1/+1
2016-08-12Merge branch 'kw/patch-ids-optim'Junio C Hamano1-6/+10
2016-08-10Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning' into maintJunio C Hamano1-0/+7
2016-08-03Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning'Junio C Hamano1-0/+7
2016-07-29patch-ids: add flag to create the diff patch id using header only dataKevin Willford1-6/+10
2016-07-22diff: do not reuse worktree files that need "clean" conversionJeff King1-0/+7
2016-07-19Merge branch 'bc/cocci'Junio C Hamano1-46/+53
2016-06-28diff: convert prep_temp_blob() to struct object_idbrian m. carlson1-4/+4
2016-06-28diff: rename struct diff_filespec's sha1_valid memberbrian m. carlson1-14/+14
2016-06-28diff: convert struct diff_filespec to struct object_idbrian m. carlson1-31/+38
2016-06-28coccinelle: convert hashcpy() with null_sha1 to hashclr()brian m. carlson1-1/+1
2016-06-28diff: do not color output when --color=auto and --output=<file> is givenJohannes Schindelin1-0/+2
2016-06-10Merge branch 'jk/diff-compact-heuristic'Junio C Hamano1-1/+1
2016-06-10diff: disable compaction heuristic for nowJunio C Hamano1-1/+1
2016-05-06Merge branch 'jk/diff-compact-heuristic'Junio C Hamano1-0/+11
2016-04-19xdiff: implement empty line chunk heuristicStefan Beller1-0/+11
2016-04-03Merge branch 'mm/diff-renames-default'Junio C Hamano1-0/+5
2016-02-26Merge branch 'jk/tighten-alloc'Junio C Hamano1-13/+10
2016-02-26Merge branch 'jk/more-comments-on-textconv'Junio C Hamano1-1/+4
2016-02-25diff: activate diff.renames by defaultMatthieu Moy1-0/+5
2016-02-22diff_populate_gitlink: use a strbufJeff King1-8/+8
2016-02-22convert trivial cases to FLEX_ARRAY macrosJeff King1-5/+2
2016-02-22diff: clarify textconv interfaceJeff King1-1/+4
2016-02-05Merge branch 'nd/diff-with-path-params' into maintJunio C Hamano1-4/+10
2016-02-03Merge branch 'nd/diff-with-path-params'Junio C Hamano1-4/+10
2016-01-21diff: make -O and --output work in subdirectoryDuy Nguyen1-4/+10
2015-10-29Merge branch 'tk/sigchain-unnecessary-post-tempfile'Junio C Hamano1-1/+0
2015-10-22diff: remove unused #include "sigchain.h"Tobias Klauser1-1/+0
2015-10-20Merge branch 'jk/war-on-sprintf'Junio C Hamano1-11/+10
2015-10-05use sha1_to_hex_r() instead of strcpyJeff King1-5/+4
2015-09-28Sync with v2.5.4Junio C Hamano1-10/+16
2015-09-28Sync with 2.4.10Junio C Hamano1-10/+16
2015-09-28Sync with 2.3.10Junio C Hamano1-10/+16
2015-09-28react to errors in xdi_diffJeff King1-10/+16
2015-09-25convert trivial sprintf / strcpy calls to xsnprintfJeff King1-6/+6
2015-08-31Merge branch 'hv/submodule-config'Junio C Hamano1-0/+1
2015-08-25Merge branch 'mh/tempfile'Junio C Hamano1-23/+23
2015-08-19submodule: use new config API for worktree configurationsHeiko Voigt1-0/+1
2015-08-12diff: use tempfile moduleMichael Haggerty1-23/+23
2015-08-03Merge branch 'dt/log-follow-config'Junio C Hamano1-2/+3
2015-07-15Merge branch 'jc/diff-ws-error-highlight'Junio C Hamano1-1/+6
2015-07-12diff: parse ws-error-highlight option more strictlyRené Scharfe1-1/+6
2015-07-09log: add "log.follow" configuration variableDavid Turner1-2/+3
2015-06-25Merge branch 'jk/color-diff-plain-is-context' into maintJunio C Hamano1-14/+14
2015-06-11Merge branch 'jk/color-diff-plain-is-context'Junio C Hamano1-15/+15
2015-06-11Merge branch 'jc/diff-ws-error-highlight'Junio C Hamano1-22/+100
2015-05-27diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXTJeff King1-13/+13
2015-05-27diff: accept color.diff.context as a synonym for "plain"Jeff King1-1/+1
2015-05-26diff.c: --ws-error-highlight=<kind> optionJunio C Hamano1-16/+68
2015-05-26diff.c: add emit_del_line() and emit_context_line()Junio C Hamano1-12/+38
2015-03-23Merge branch 'rs/deflate-init-cleanup' into maintJunio C Hamano1-1/+0
2015-03-17Merge branch 'rs/deflate-init-cleanup'Junio C Hamano1-1/+0
2015-03-13Merge branch 'mk/diff-shortstat-dirstat-fix' into maintJunio C Hamano1-1/+1
2015-03-06Merge branch 'mk/diff-shortstat-dirstat-fix'Junio C Hamano1-1/+1
2015-03-05zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}René Scharfe1-1/+0
2015-03-02diff --shortstat --dirstat: remove duplicate outputMårten Kongstad1-1/+1
2014-10-20Merge branch 'jn/parse-config-slot'Junio C Hamano1-2/+1
2014-10-14color_parse: do not mention variable name in error messageJeff King1-2/+1
2014-09-11Merge branch 'nd/large-blobs'Junio C Hamano1-14/+38
2014-08-20run-command: introduce CHILD_PROCESS_INITRené Scharfe1-2/+1
2014-08-18diff: shortcut for diff'ing two binary SHA-1 objectsNguyễn Thái Ngọc Duy1-0/+13
2014-08-18diff --stat: mark any file larger than core.bigfilethreshold binaryNguyễn Thái Ngọc Duy1-8/+18
2014-08-18diff.c: allow to pass more flags to diff_populate_filespecNguyễn Thái Ngọc Duy1-6/+7
2014-07-22Merge branch 'bg/xcalloc-nmemb-then-size' into maintJunio C Hamano1-1/+1
2014-07-17strbuf: use strbuf_addstr() for adding C stringsRené Scharfe1-6/+6
2014-06-25Merge branch 'jk/diff-follow-must-take-one-pathspec' into maintJunio C Hamano1-0/+3
2014-06-20stat_opt: check extra strlen callJeff King1-1/+2
2014-06-20use skip_prefix to avoid repeating stringsJeff King1-18/+9
2014-06-20use skip_prefix to avoid magic numbersJeff King1-31/+34
2014-06-18parse_diff_color_slot: drop ofs parameterJeff King1-10/+10
2014-06-16Merge branch 'bg/xcalloc-nmemb-then-size'Junio C Hamano1-1/+1
2014-06-16Merge branch 'jk/diff-follow-must-take-one-pathspec'Junio C Hamano1-0/+3
2014-06-03Merge branch 'jk/external-diff-use-argv-array'Junio C Hamano1-31/+25
2014-06-03Merge branch 'ks/tree-diff-nway'Junio C Hamano1-0/+2
2014-05-27diff.c: rearrange xcalloc argumentsBrian Gesiak1-1/+1
2014-05-20move "--follow needs one pathspec" rule to diff_setup_doneJeff King1-0/+3
2014-04-28Merge branch 'jk/external-diff-use-argv-array' (early part)Junio C Hamano1-16/+16
2014-04-21run_external_diff: refactor cmdline setup logicJeff King1-11/+15
2014-04-21run_external_diff: hoist common bits out of conditionalJeff King1-5/+3
2014-04-21run_external_diff: drop fflush(NULL)Jeff King1-1/+0
2014-04-21run_external_diff: clean up error handlingJeff King1-6/+3
2014-04-21run_external_diff: use an argv_array for the environmentJeff King1-9/+5
2014-04-21run_external_diff: use an argv_array for the command lineJeff King1-16/+16
2014-04-17i18n: remove obsolete comments for translators in diffstat generationJiang Xin1-8/+0
2014-04-08Merge branch 'jl/nor-or-nand-and'Junio C Hamano1-1/+1
2014-04-07combine-diff: speed it up, by using multiparent diff tree-walker directlyKirill Smelkov1-0/+1
2014-04-07tree-diff: rework diff_tree() to generate diffs for multiparent cases as wellKirill Smelkov1-0/+1
2014-03-31comments: fix misuses of "nor"Justin Lebar1-1/+1
2014-03-18Merge branch 'tr/diff-submodule-no-reuse-worktree' into maintJunio C Hamano1-2/+3
2014-03-18Merge branch 'nd/diff-quiet-stat-dirty' into maintJunio C Hamano1-24/+43
2014-03-18Merge branch 'rm/strchrnul-not-strlen'Junio C Hamano1-6/+3
2014-03-18Merge branch 'dd/use-alloc-grow'Junio C Hamano1-10/+2
2014-03-14Merge branch 'tr/diff-submodule-no-reuse-worktree'Junio C Hamano1-2/+3
2014-03-10use strchrnul() in place of strchr() and strlen()Rohit Mani1-6/+3
2014-03-07Merge branch 'jc/hold-diff-remove-q-synonym-for-no-deletion'Junio C Hamano1-8/+0
2014-03-03diff.c: use ALLOC_GROW()Dmitry S. Dolzhenko1-10/+2
2014-02-27Merge branch 'nd/diff-quiet-stat-dirty'Junio C Hamano1-24/+43
2014-02-24diff: do not quit early on stat-dirty filesNguyễn Thái Ngọc Duy1-5/+17
2014-02-24diff.c: move diffcore_skip_stat_unmatch core logic out for reuse laterNguyễn Thái Ngọc Duy1-21/+28
2014-02-18diff: do not reuse_worktree_file for submodulesThomas Rast1-2/+3
2014-01-27Merge branch 'jk/diff-filespec-cleanup'Junio C Hamano1-2/+2
2014-01-17diff_filespec: drop xfrm_flags fieldJeff King1-2/+2
2014-01-10Merge branch 'sb/diff-orderfile-config'Junio C Hamano1-0/+5
2013-12-27Merge branch 'zk/difftool-counts'Junio C Hamano1-3/+17
2013-12-18diff: add diff.orderfile configuration variableSamuel Bronson1-0/+5
2013-12-17Merge branch 'cc/starts-n-ends-with'Junio C Hamano1-28/+28
2013-12-16diff.c: fix some recent whitespace style violationsJeff King1-2/+2
generated by cgit 1.2.3-korg (git 2.43.0) at 2025-12-21 06:19:59 +0000