aboutsummaryrefslogtreecommitdiffstats
path: root/xdiff-interface.c
AgeCommit message (Expand)AuthorFilesLines
2024-03-14xdiff-interface: refactor parsing of merge.conflictstylePhillip Wood1-11/+18
2024-01-08Merge branch 'en/header-cleanup'Junio C Hamano1-2/+0
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren1-2/+0
2023-12-09config: use config_error_nonbool() instead of custom messagesJeff King1-1/+1
2023-12-09git_xmerge_config(): prefer error() to die()Jeff King1-3/+4
2023-07-06Merge branch 'gc/config-context'Junio C Hamano1-2/+3
2023-06-28config: add ctx arg to config_fn_tGlen Choo1-2/+3
2023-06-21object-store-ll.h: split this header out of object-store.hElijah Newren1-1/+2
2023-04-06Merge branch 'en/header-split-cleanup'Junio C Hamano1-1/+1
2023-04-06Merge branch 'ab/remove-implicit-use-of-the-repository'Junio C Hamano1-1/+1
2023-03-28cocci: apply the "object-store.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-1/+1
2023-03-21treewide: remove unnecessary cache.h inclusion from several sourcesElijah Newren1-1/+1
2023-02-23cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren1-0/+1
2022-05-02Merge branch 'ep/maint-equals-null-cocci' for maint-2.35Junio C Hamano1-1/+1
2022-05-02tree-wide: apply equals-null.cocciJunio C Hamano1-1/+1
2021-12-01xdiff: implement a zealous diff3, or "zdiff3"Phillip Wood1-0/+2
2021-07-13Merge branch 'ab/pickaxe-pcre2'Junio C Hamano1-11/+16
2021-05-11xdiff-interface: replace discard_hunk_line() with a flagÆvar Arnfjörð Bjarmason1-6/+0
2021-05-11xdiff-interface: allow early return from xdiff_emit_line_fnÆvar Arnfjörð Bjarmason1-4/+14
2021-05-11xdiff-interface: prepare for allowing early returnÆvar Arnfjörð Bjarmason1-1/+2
2021-04-27hash: provide per-algorithm null OIDsbrian m. carlson1-1/+1
2020-01-28xdiff: avoid computing non-zero offset from NULL pointerJeff King1-2/+6
2020-01-28avoid computing zero offsets from NULL pointerJeff King1-2/+2
2019-02-20completion: add more parameter value completionNguyễn Thái Ngọc Duy1-0/+4
2018-11-13Merge branch 'jk/xdiff-interface'Junio C Hamano1-45/+31
2018-11-05xdiff-interface: drop parse_hunk_header()Jeff King1-45/+0
2018-11-05diff: use hunk callback for word-diffJeff King1-0/+3
2018-11-05diff: avoid generating unused hunk header linesJeff King1-0/+6
2018-11-02xdiff-interface: provide a separate consume callback for hunksJeff King1-4/+26
2018-11-02xdiff: provide a separate emit callback for hunksJeff King1-1/+1
2018-08-29convert "oidcmp() == 0" to oideq()Jeff King1-1/+1
2018-05-16object-store: move object access functions to object-store.hStefan Beller1-0/+1
2018-03-14sha1_file: convert read_sha1_file to struct object_idbrian m. carlson1-1/+1
2017-10-26xdiff-interface: export comparing and hashing stringsStefan Beller1-0/+12
2017-06-24Merge branch 'bw/config-h'Junio C Hamano1-0/+1
2017-06-15config: don't include config.h by defaultBrandon Williams1-0/+1
2017-05-26print errno when reporting a system call errorNguyễn Thái Ngọc Duy1-2/+2
2016-09-26Merge branch 'js/regexec-buf'Junio C Hamano1-9/+4
2016-09-21regex: use regexec_buf()Johannes Schindelin1-9/+4
2016-09-07Convert read_mmblob to take struct object_id.brian m. carlson1-4/+4
2016-05-31xdiff: don't trim common tail with -WRené Scharfe1-6/+4
2016-02-22convert trivial cases to ALLOC_ARRAYJeff King1-1/+1
2015-09-28xdiff: reject files larger than ~1GBJeff King1-0/+3
2012-05-09xdiff: remove emit_func() and xdi_diff_hunks()René Scharfe1-44/+0
2011-05-14add, merge, diff: do not use strcasecmp to compare config variable namesJonathan Nieder1-1/+1
2010-12-26Merge branch 'rs/maint-diff-fd-leak' into maintJunio C Hamano1-1/+3
2010-12-26close file on error in read_mmfile()René Scharfe1-1/+3
2010-09-09xdiff-interface.c: always trim trailing space from xfuncname matchesBrandon Casey1-3/+2
2010-05-04Merge branch 'maint-1.7.0' into maintJunio C Hamano1-5/+6
2010-05-04remove ecb parameter from xdi_diff_outf()René Scharfe1-5/+6
2010-02-17refactor duplicated fill_mm() in checkout and merge-recursiveMichael Lukashov1-0/+17
2009-07-01userdiff: add xdiff_clear_find_func()René Scharfe1-0/+15
2009-03-07Remove unused function scope local variablesBenjamin Kramer1-2/+1
2008-11-26xdiff-interface.c: remove 10 duplicated linesJim Meyering1-11/+0
2008-11-08Merge branch 'rs/blame'Junio C Hamano1-1/+48
2008-10-25add xdi_diff_hunks() for callers that only need hunk lengthsRené Scharfe1-1/+48
2008-10-17Merge branch 'maint'Junio C Hamano1-0/+10
2008-10-16xdiff-interface.c: strip newline (and cr) from line before pattern matchingBrandon Casey1-1/+11
2008-10-02xdiff-interface.c: strip newline (and cr) from line before pattern matchingBrandon Casey1-1/+11
2008-09-29Merge branch 'bc/master-diff-hunk-header-fix'Shawn O. Pearce1-9/+12
2008-09-29Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce1-0/+20
2008-09-20diff: fix "multiple regexp" semantics to find hunk header commentJunio C Hamano1-7/+10
2008-09-18Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano1-2/+2
2008-09-18diff.c: associate a flag with each pattern and use it for compiling regexBrandon Casey1-2/+2
2008-08-30merge.conflictstyle: choose between "merge" and "diff3 -m" stylesJunio C Hamano1-0/+20
2008-08-14xdiff-interface: hide the whole "xdiff_emit_state" business from the callerJunio C Hamano1-5/+18
2008-08-13Use strbuf for struct xdiff_emit_state's remainderBrian Downing1-22/+10
2008-08-13Make xdi_diff_outf interface for running xdiff_outf diffsBrian Downing1-1/+12
2008-03-14Merge branch 'maint'Junio C Hamano1-2/+2
2008-03-13merge-file: handle empty files gracefullyJohannes Schindelin1-2/+2
2008-02-22Avoid unnecessary "if-before-free" tests.Jim Meyering1-2/+1
2007-12-20Re(-re)*fix trim_common_tail()Linus Torvalds1-4/+7
2007-12-16Re-re-re-fix common tail optimizationJunio C Hamano1-1/+1
2007-12-16trim_common_tail: brown paper bag fix.Jeff King1-5/+4
2007-12-14xdiff tail trimming: use correct type.Junio C Hamano1-3/+2
2007-12-13xdi_diff: trim common trailing linesJunio C Hamano1-1/+33
2007-12-13xdl_diff: identify call sites.Junio C Hamano1-0/+5
2007-07-06Per-path attribute based hunk header selection.Junio C Hamano1-0/+71
2007-06-07War on whitespaceJunio C Hamano1-2/+0
2007-06-04Move buffer_is_binary() to xdiff-interface.hJohannes Schindelin1-0/+8
2007-03-07Cast 64 bit off_t to 32 bit size_tShawn O. Pearce1-3/+5
2006-12-21move read_mmfile() into xdiff-interfaceJohannes Schindelin1-0/+19
2006-08-26Use xrealloc instead of reallocJonas Fonseca1-6/+6
2006-04-06Match ofs/cnt types in diff interface.Junio C Hamano1-4/+4
2006-04-05combine-diff: move the code to parse hunk-header into common library.Junio C Hamano1-0/+46
2006-04-05combine-diff: refactor built-in xdiff interface.Junio C Hamano1-0/+58
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-29 11:39:59 +0000