- 7457014 xdiff-interface: refactor parsing of merge.conflictstyle by Phillip Wood · 10 months ago
- 492ee03 Merge branch 'en/header-cleanup' by Junio C Hamano · 1 year, 1 month ago
- eea0e59 treewide: remove unnecessary includes in source files by Elijah Newren · 1 year, 1 month ago
- 92cecce config: use config_error_nonbool() instead of custom messages by Jeff King · 1 year, 2 months ago
- 22e2741 git_xmerge_config(): prefer error() to die() by Jeff King · 1 year, 2 months ago
- b3d1c85 Merge branch 'gc/config-context' by Junio C Hamano · 1 year, 7 months ago
- a4e7e31 config: add ctx arg to config_fn_t by Glen Choo · 1 year, 7 months ago
- a034e91 object-store-ll.h: split this header out of object-store.h by Elijah Newren · 1 year, 8 months ago
- 6047b28 Merge branch 'en/header-split-cleanup' by Junio C Hamano · 1 year, 10 months ago
- 72871b19 Merge branch 'ab/remove-implicit-use-of-the-repository' by Junio C Hamano · 1 year, 10 months ago
- bc726bd cocci: apply the "object-store.h" part of "the_repository.pending" by Ævar Arnfjörð Bjarmason · 1 year, 10 months ago
- 4f6728d treewide: remove unnecessary cache.h inclusion from several sources by Elijah Newren · 1 year, 10 months ago
- 41771fa cache.h: remove dependence on hex.h; make other files include it explicitly by Elijah Newren · 1 year, 11 months ago
- 2b0a58d Merge branch 'ep/maint-equals-null-cocci' for maint-2.35 by Junio C Hamano · 2 years, 9 months ago
- afe8a90 tree-wide: apply equals-null.cocci by Junio C Hamano · 2 years, 9 months ago
- 4496526 xdiff: implement a zealous diff3, or "zdiff3" by Phillip Wood · 3 years, 2 months ago
- 4da281e Merge branch 'ab/pickaxe-pcre2' by Junio C Hamano · 3 years, 6 months ago
- 5d93460 xdiff-interface: replace discard_hunk_line() with a flag by Ævar Arnfjörð Bjarmason · 3 years, 10 months ago
- 9e20442 xdiff-interface: allow early return from xdiff_emit_line_fn by Ævar Arnfjörð Bjarmason · 3 years, 10 months ago
- a8d5eb6 xdiff-interface: prepare for allowing early return by Ævar Arnfjörð Bjarmason · 3 years, 10 months ago
- 1422844 hash: provide per-algorithm null OIDs by brian m. carlson · 3 years, 9 months ago
- 3cd309c xdiff: avoid computing non-zero offset from NULL pointer by Jeff King · 5 years ago
- d20bc01 avoid computing zero offsets from NULL pointer by Jeff King · 5 years ago
- 5a59a23 completion: add more parameter value completion by Nguyễn Thái Ngọc Duy · 6 years ago
- 39d23df Merge branch 'jk/xdiff-interface' by Junio C Hamano · 6 years ago
- 5eade07 xdiff-interface: drop parse_hunk_header() by Jeff King · 6 years ago
- 7c61e25 diff: use hunk callback for word-diff by Jeff King · 6 years ago
- 3b40a09 diff: avoid generating unused hunk header lines by Jeff King · 6 years ago
- 9346d6d xdiff-interface: provide a separate consume callback for hunks by Jeff King · 6 years ago
- 611e42a xdiff: provide a separate emit callback for hunks by Jeff King · 6 years ago
- 4a7e27e convert "oidcmp() == 0" to oideq() by Jeff King · 6 years ago
- cbd53a2 object-store: move object access functions to object-store.h by Stefan Beller · 7 years ago
- b4f5aca sha1_file: convert read_sha1_file to struct object_id by brian m. carlson · 7 years ago
- 5ec8274 xdiff-interface: export comparing and hashing strings by Stefan Beller · 7 years ago
- f31d23a Merge branch 'bw/config-h' by Junio C Hamano · 8 years ago
- b2141fc config: don't include config.h by default by Brandon Williams · 8 years ago
- 5118d7f print errno when reporting a system call error by Nguyễn Thái Ngọc Duy · 8 years ago
- 6a67695 Merge branch 'js/regexec-buf' by Junio C Hamano · 8 years ago
- b7d36ff regex: use regexec_buf() by Johannes Schindelin · 8 years ago
- d449347 Convert read_mmblob to take struct object_id. by brian m. carlson · 8 years ago
- e0876bc xdiff: don't trim common tail with -W by René Scharfe · 9 years ago
- b32fa95 convert trivial cases to ALLOC_ARRAY by Jeff King · 9 years ago
- dcd1742 xdiff: reject files larger than ~1GB by Jeff King · 9 years ago
- 3319e60 xdiff: remove emit_func() and xdi_diff_hunks() by René Scharfe · 13 years ago
- 8c2be75 add, merge, diff: do not use strcasecmp to compare config variable names by Jonathan Nieder · 14 years ago
- 26517de Merge branch 'rs/maint-diff-fd-leak' into maint by Junio C Hamano · 14 years ago
- 5fd8981 close file on error in read_mmfile() by René Scharfe · 14 years ago
- 1b6ecba xdiff-interface.c: always trim trailing space from xfuncname matches by Brandon Casey · 14 years ago
- 6b6f5d4 Merge branch 'maint-1.7.0' into maint by Junio C Hamano · 15 years ago
- dfea790 remove ecb parameter from xdi_diff_outf() by René Scharfe · 15 years ago
- 06b6593 refactor duplicated fill_mm() in checkout and merge-recursive by Michael Lukashov · 15 years ago
- 8cfe5f1 userdiff: add xdiff_clear_find_func() by René Scharfe · 16 years ago
- eb3a9dd Remove unused function scope local variables by Benjamin Kramer · 16 years ago
- c095a1d xdiff-interface.c: remove 10 duplicated lines by Jim Meyering · 16 years ago
- 1e2bba9 Merge branch 'rs/blame' by Junio C Hamano · 16 years ago
- 86295bb add xdi_diff_hunks() for callers that only need hunk lengths by René Scharfe · 16 years ago
- 46dc1b0 Merge branch 'maint' by Junio C Hamano · 16 years ago
- 563d5a2 xdiff-interface.c: strip newline (and cr) from line before pattern matching by Brandon Casey · 16 years ago
- a5a5a04 xdiff-interface.c: strip newline (and cr) from line before pattern matching by Brandon Casey · 16 years ago
- 9800c0d Merge branch 'bc/master-diff-hunk-header-fix' by Shawn O. Pearce · 16 years ago
- 9ba929e Merge branch 'jc/better-conflict-resolution' by Shawn O. Pearce · 16 years ago
- 3d8dccd diff: fix "multiple regexp" semantics to find hunk header comment by Junio C Hamano · 16 years ago
- dde4af4 Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix by Junio C Hamano · 16 years ago
- a013585 diff.c: associate a flag with each pattern and use it for compiling regex by Brandon Casey · 16 years ago
- b541248 merge.conflictstyle: choose between "merge" and "diff3 -m" styles by Junio C Hamano · 16 years ago
- 8a3f524 xdiff-interface: hide the whole "xdiff_emit_state" business from the caller by Junio C Hamano · 16 years ago
- b463776 Use strbuf for struct xdiff_emit_state's remainder by Brian Downing · 16 years ago
- c99db9d2 Make xdi_diff_outf interface for running xdiff_outf diffs by Brian Downing · 16 years ago
- 16007f3 Merge branch 'maint' by Junio C Hamano · 17 years ago
- 381b851 merge-file: handle empty files gracefully by Johannes Schindelin · 17 years ago
- 8e0f700 Avoid unnecessary "if-before-free" tests. by Jim Meyering · 17 years ago
- d2f8295 Re(-re)*fix trim_common_tail() by Linus Torvalds · 17 years ago
- 079fe1d Re-re-re-fix common tail optimization by Junio C Hamano · 17 years ago
- 5249997 trim_common_tail: brown paper bag fix. by Jeff King · 17 years ago
- 29ab27f xdiff tail trimming: use correct type. by Junio C Hamano · 17 years ago
- 913b45f xdi_diff: trim common trailing lines by Junio C Hamano · 17 years ago
- c279d7e xdl_diff: identify call sites. by Junio C Hamano · 17 years ago
- f258475 Per-path attribute based hunk header selection. by Junio C Hamano · 18 years ago
- a6080a0 War on whitespace by Junio C Hamano · 18 years ago
- 6bfce93 Move buffer_is_binary() to xdiff-interface.h by Johannes Schindelin · 18 years ago
- dc49cd7 Cast 64 bit off_t to 32 bit size_t by Shawn O. Pearce · 18 years ago
- 7cab588 move read_mmfile() into xdiff-interface by Johannes Schindelin · 18 years ago
- 83572c1 Use xrealloc instead of realloc by Jonas Fonseca · 18 years ago
- a0fd314 Match ofs/cnt types in diff interface. by Junio C Hamano · 19 years ago
- c1e335a combine-diff: move the code to parse hunk-header into common library. by Junio C Hamano · 19 years ago
- d9ea73e combine-diff: refactor built-in xdiff interface. by Junio C Hamano · 19 years ago