summaryrefslogtreecommitdiff
path: root/xdiff
Commit message (Expand)AuthorAgeFilesLines
* xdiff: provide a separate emit callback for hunksJeff King2018-11-022-5/+22
* Merge branch 'sb/indent-heuristic-optim'Junio C Hamano2018-08-171-1/+11
|\
| * xdiff: reduce indent heuristic overheadStefan Beller2018-08-011-1/+11
* | Merge branch 'sb/histogram-less-memory'Junio C Hamano2018-08-151-55/+78
|\ \
| * | xdiff/histogram: remove tail recursionStefan Beller2018-07-231-6/+14
| * | xdiff/xhistogram: move index allocation into find_lcsStefan Beller2018-07-191-43/+53
| * | xdiff/xhistogram: factor out memory cleanup into free_index()Stefan Beller2018-07-191-4/+9
| * | xdiff/xhistogram: pass arguments directly to fall_back_to_classic_diffStefan Beller2018-07-191-11/+11
| * | Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' into maintJunio C Hamano2016-09-291-1/+1
| |\ \
* | | | xdiff/xdiffi.c: remove unneeded function declarationsStefan Beller2018-07-171-17/+0
* | | | xdiff/xdiff.h: remove unused flagsStefan Beller2018-07-171-8/+0
| |_|/ |/| |
* | | Merge branch 'jt/diff-anchored-patience'Junio C Hamano2017-12-192-5/+41
|\ \ \
| * | | diff: support anchoring line(s)jt/diff-anchored-patienceJonathan Tan2017-11-282-5/+41
* | | | Merge branch 'rs/include-comments-before-the-function-header'Junio C Hamano2017-11-281-3/+10
|\ \ \ \ | |/ / / |/| | |
| * | | xdiff: show non-empty lines before functions with -WRené Scharfe2017-11-211-0/+3
| * | | xdiff: factor out is_func_rec()René Scharfe2017-11-211-3/+7
* | | | Merge branch 'jc/ignore-cr-at-eol'Junio C Hamano2017-11-272-12/+52
|\ \ \ \ | |/ / / |/| | |
| * | | diff: --ignore-cr-at-eoljc/ignore-cr-at-eolJunio C Hamano2017-11-082-3/+39
| * | | xdiff: reassign xpparm_t.flags bitsJunio C Hamano2017-10-271-10/+14
* | | | Replace Free Software Foundation address in license noticesTodd Zullinger2017-11-0914-28/+28
* | | | cleanup: fix possible overflow errors in binary searchds/avoid-overflow-in-midpoint-computationDerrick Stolee2017-10-101-1/+1
|/ / /
* | | xdiff -W: relax end-of-file function detectionvn/xdiff-func-contextVegard Nossum2017-01-151-8/+6
* | | Merge branch 'jc/retire-compaction-heuristics'Junio C Hamano2017-01-102-35/+1
|\ \ \
| * | | diff: retire "compaction" heuristicsjc/retire-compaction-heuristicsJunio C Hamano2016-12-232-35/+1
* | | | xdiff: drop XDL_FAST_HASHjk/xdiff-drop-xdl-fast-hashJeff King2016-12-061-106/+0
|/ / /
* | | Merge branch 'mh/diff-indent-heuristic'Junio C Hamano2016-10-031-7/+7
|\ \ \
| * | | xdiff: rename "struct group" to "struct xdlgroup"mh/diff-indent-heuristicJeff King2016-09-271-7/+7
* | | | Merge branch 'mh/diff-indent-heuristic'Junio C Hamano2016-09-262-98/+538
|\ \ \ \ | |/ / /
| * | | diff: improve positioning of add/delete blocks in diffsMichael Haggerty2016-09-192-0/+326
| * | | xdl_change_compact(): introduce the concept of a change groupMichael Haggerty2016-08-231-90/+203
| * | | recs_match(): take two xrecord_t pointers as argumentsMichael Haggerty2016-08-231-7/+7
| * | | is_blank_line(): take a single xrecord_t as argumentMichael Haggerty2016-08-231-4/+4
| * | | xdl_change_compact(): only use heuristic if group can't be matchedMichael Haggerty2016-08-231-19/+19
| * | | xdl_change_compact(): fix compaction heuristic to adjust ixoMichael Haggerty2016-08-231-0/+1
| * | | Merge branch 'rs/xdiff-hunk-with-func-line'Junio C Hamano2016-06-201-8/+57
| |\ \ \
* | \ \ \ Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context'Junio C Hamano2016-09-211-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | xdiff: fix merging of hunks with -W context and -u contextrs/xdiff-merge-overlapping-hunks-for-W-contextRené Scharfe2016-09-141-1/+1
* | | | xdiff: remove unneeded declarationssb/xdiff-remove-unused-static-declStefan Beller2016-09-071-9/+0
|/ / /
* | | Merge branch 'js/ignore-space-at-eol' into maintJunio C Hamano2016-08-082-3/+5
|\ \ \
| * | | diff: fix a double off-by-one with --ignore-space-at-eoljs/ignore-space-at-eolJohannes Schindelin2016-07-112-3/+5
* | | | Merge branch 'rs/xdiff-hunk-with-func-line' into maintJunio C Hamano2016-06-271-8/+57
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | xdiff: fix merging of appended hunk with -Wrs/xdiff-hunk-with-func-lineRené Scharfe2016-06-091-1/+2
| * | xdiff: -W: don't include common trailing empty lines in contextRené Scharfe2016-05-311-0/+2
| * | xdiff: ignore empty lines before added functions with -WRené Scharfe2016-05-311-2/+20
| * | xdiff: handle appended chunks better with -WRené Scharfe2016-05-311-3/+24
| * | xdiff: factor out match_func_rec()René Scharfe2016-05-311-4/+11
* | | Merge branch 'jk/diff-compact-heuristic'Junio C Hamano2016-05-062-4/+38
|\ \ \
| * | | xdiff: implement empty line chunk heuristicStefan Beller2016-04-192-0/+28
| * | | xdiff: add recs_match helper functionJacob Keller2016-04-181-4/+10
| | |/ | |/|
* | | Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath'Junio C Hamano2016-04-031-1/+2
|\ \ \ | |_|/ |/| |
View Lorry Controller Status