summaryrefslogtreecommitdiff
path: root/xdiff-interface.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/xdiff-interface'Junio C Hamano2018-11-131-45/+31
|\
| * xdiff-interface: drop parse_hunk_header()Jeff King2018-11-051-45/+0
| * diff: use hunk callback for word-diffJeff King2018-11-051-0/+3
| * diff: avoid generating unused hunk header linesJeff King2018-11-051-0/+6
| * xdiff-interface: provide a separate consume callback for hunksJeff King2018-11-021-4/+26
| * xdiff: provide a separate emit callback for hunksJeff King2018-11-021-1/+1
* | convert "oidcmp() == 0" to oideq()Jeff King2018-08-291-1/+1
|/
* object-store: move object access functions to object-store.hStefan Beller2018-05-161-0/+1
* sha1_file: convert read_sha1_file to struct object_idbrian m. carlson2018-03-141-1/+1
* xdiff-interface: export comparing and hashing stringsStefan Beller2017-10-261-0/+12
* Merge branch 'bw/config-h'Junio C Hamano2017-06-241-0/+1
|\
| * config: don't include config.h by defaultBrandon Williams2017-06-151-0/+1
* | print errno when reporting a system call errorNguyễn Thái Ngọc Duy2017-05-261-2/+2
|/
* Merge branch 'js/regexec-buf'Junio C Hamano2016-09-261-9/+4
|\
| * regex: use regexec_buf()Johannes Schindelin2016-09-211-9/+4
* | Convert read_mmblob to take struct object_id.brian m. carlson2016-09-071-4/+4
* | xdiff: don't trim common tail with -WRené Scharfe2016-05-311-6/+4
|/
* convert trivial cases to ALLOC_ARRAYJeff King2016-02-221-1/+1
* xdiff: reject files larger than ~1GBJeff King2015-09-281-0/+3
* xdiff: remove emit_func() and xdi_diff_hunks()René Scharfe2012-05-091-44/+0
* add, merge, diff: do not use strcasecmp to compare config variable namesJonathan Nieder2011-05-141-1/+1
* Merge branch 'rs/maint-diff-fd-leak' into maintJunio C Hamano2010-12-261-1/+3
|\
| * close file on error in read_mmfile()René Scharfe2010-12-261-1/+3
* | xdiff-interface.c: always trim trailing space from xfuncname matchesBrandon Casey2010-09-091-3/+2
* | Merge branch 'maint-1.7.0' into maintJunio C Hamano2010-05-041-5/+6
|\ \
| * | remove ecb parameter from xdi_diff_outf()René Scharfe2010-05-041-5/+6
| |/
* | refactor duplicated fill_mm() in checkout and merge-recursiveMichael Lukashov2010-02-171-0/+17
|/
* userdiff: add xdiff_clear_find_func()René Scharfe2009-07-011-0/+15
* Remove unused function scope local variablesBenjamin Kramer2009-03-071-2/+1
* xdiff-interface.c: remove 10 duplicated linesJim Meyering2008-11-261-11/+0
* Merge branch 'rs/blame'Junio C Hamano2008-11-081-1/+48
|\
| * add xdi_diff_hunks() for callers that only need hunk lengthsRené Scharfe2008-10-251-1/+48
* | Merge branch 'maint'Junio C Hamano2008-10-171-0/+10
|\ \ | |/ |/|
| * xdiff-interface.c: strip newline (and cr) from line before pattern matchingBrandon Casey2008-10-161-1/+11
* | xdiff-interface.c: strip newline (and cr) from line before pattern matchingBrandon Casey2008-10-021-1/+11
* | Merge branch 'bc/master-diff-hunk-header-fix'Shawn O. Pearce2008-09-291-9/+12
|\ \
| * | diff: fix "multiple regexp" semantics to find hunk header commentJunio C Hamano2008-09-201-7/+10
| * | Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano2008-09-181-2/+2
| |\ \ | | |/
| | * diff.c: associate a flag with each pattern and use it for compiling regexBrandon Casey2008-09-181-2/+2
* | | Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce2008-09-291-0/+20
|\ \ \ | |/ / |/| |
| * | merge.conflictstyle: choose between "merge" and "diff3 -m" stylesJunio C Hamano2008-08-301-0/+20
| |/
* | xdiff-interface: hide the whole "xdiff_emit_state" business from the callerJunio C Hamano2008-08-141-5/+18
* | Use strbuf for struct xdiff_emit_state's remainderBrian Downing2008-08-131-22/+10
* | Make xdi_diff_outf interface for running xdiff_outf diffsBrian Downing2008-08-131-1/+12
|/
* Merge branch 'maint'Junio C Hamano2008-03-141-2/+2
|\
| * merge-file: handle empty files gracefullyJohannes Schindelin2008-03-131-2/+2
* | Avoid unnecessary "if-before-free" tests.Jim Meyering2008-02-221-2/+1
|/
* Re(-re)*fix trim_common_tail()Linus Torvalds2007-12-201-4/+7
* Re-re-re-fix common tail optimizationJunio C Hamano2007-12-161-1/+1
* trim_common_tail: brown paper bag fix.Jeff King2007-12-161-5/+4
View Lorry Controller Status