summaryrefslogtreecommitdiff
path: root/xdiff
AgeCommit message (Expand)AuthorFilesLines
2016-03-10Merge branch 'jk/no-diff-emit-common' into maintLibravatar Junio C Hamano2-19/+0
2016-02-22xdiff: drop XDL_EMIT_COMMONLibravatar Jeff King2-19/+0
2016-01-27merge-file: ensure that conflict sections match eol styleLibravatar Johannes Schindelin1-14/+23
2016-01-27merge-file: let conflict markers match end-of-line style of the contextLibravatar Johannes Schindelin1-4/+57
2014-06-30git-merge-file: do not add LF at EOF while applying unrelated changeLibravatar Max Kirillov1-2/+2
2013-10-16C: have space around && and || operatorsLibravatar Junio C Hamano1-1/+1
2013-06-19diff: add --ignore-blank-lines optionLibravatar Antoine Pelisse7-8/+89
2013-04-12Correct common spelling mistakes in comments and testsLibravatar Stefano Lattarini2-2/+2
2012-05-25Merge branch 'rs/xdiff-fast-hash-fix'Libravatar Junio C Hamano1-15/+15
2012-05-23xdiff: import new 32-bit version of count_masked_bytes()Libravatar René Scharfe1-13/+5
2012-05-23xdiff: avoid more compiler warnings with XDL_FAST_HASH on 32-bit machinesLibravatar René Scharfe1-1/+7
2012-05-22xdiff: avoid compiler warnings with XDL_FAST_HASH on 32-bit machinesLibravatar René Scharfe1-3/+5
2012-05-09xdiff: remove unused functionsLibravatar René Scharfe2-46/+0
2012-05-09xdiff: remove emit_func() and xdi_diff_hunks()Libravatar René Scharfe2-6/+1
2012-05-09xdiff: add hunk_func()Libravatar René Scharfe2-0/+22
2012-05-02Merge branch 'tr/xdiff-fast-hash'Libravatar Junio C Hamano1-0/+106
2012-05-01xdiff: choose XDL_FAST_HASH code on sizeof(long) instead of __WORDSIZELibravatar Thomas Rast1-29/+23
2012-04-15Merge branch 'jc/diff-algo-cleanup'Libravatar Junio C Hamano5-21/+18
2012-04-09xdiff: load full words in the inner loop of xdl_hash_recordLibravatar Thomas Rast1-0/+112
2012-02-19xdiff: PATIENCE/HISTOGRAM are not independent option bitsLibravatar Junio C Hamano5-16/+18
2012-02-19xdiff: remove XDL_PATCH_* macrosLibravatar Junio C Hamano1-5/+0
2012-01-29Merge branch 'rs/diff-postimage-in-context'Libravatar Junio C Hamano1-6/+6
2012-01-06xdiff: print post-image for common records instead of pre-imageLibravatar René Scharfe1-6/+6
2011-10-19Merge branch 'rs/diff-whole-function'Libravatar Junio C Hamano2-16/+70
2011-10-13Merge branch 'rs/diff-cleanup-records-fix'Libravatar Junio C Hamano1-3/+7
2011-10-10diff: add option to show whole functions as contextLibravatar René Scharfe2-6/+49
2011-10-10xdiff: factor out get_func_line()Libravatar René Scharfe1-16/+27
2011-09-26Revert removal of multi-match discard heuristic in 27af01Libravatar René Scharfe1-3/+7
2011-09-06Merge branch 'rc/histogram-diff'Libravatar Junio C Hamano1-0/+2
2011-08-31xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env()Libravatar Tay Ray Chuan1-0/+2
2011-08-17Merge branch 'rc/histogram-diff' into HEADLibravatar Junio C Hamano8-125/+470
2011-08-17xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records()Libravatar Tay Ray Chuan1-36/+50
2011-08-08xdiff/xhistogram: drop need for additional variableLibravatar Tay Ray Chuan1-5/+4
2011-08-08xdiff/xhistogram: rely on xdl_trim_ends()Libravatar Tay Ray Chuan1-27/+4
2011-08-08xdiff/xhistogram: rework handling of recursed resultsLibravatar Tay Ray Chuan1-6/+9
2011-08-03xdiff: do away with xdl_mmfile_next()Libravatar Tay Ray Chuan3-20/+2
2011-07-12xdiff/xprepare: use a smaller sample size for histogram diffLibravatar Tay Ray Chuan3-10/+17
2011-07-12xdiff/xprepare: skip classificationLibravatar Tay Ray Chuan1-8/+16
2011-07-12teach --histogram to diffLibravatar Tay Ray Chuan4-0/+390
2011-07-07xdiff/xpatience: factor out fall-back-diff functionLibravatar Tay Ray Chuan3-25/+35
2011-07-07xdiff/xprepare: refactor abort cleanupsLibravatar Tay Ray Chuan1-59/+32
2011-07-07xdiff/xprepare: use memset()Libravatar Tay Ray Chuan1-7/+3
2010-11-17Merge branch 'cb/diff-fname-optim'Libravatar Junio C Hamano1-24/+14
2010-10-06xdiff: cast arguments for ctype functions to unsigned charLibravatar Jonathan Nieder3-10/+11
2010-09-30diff: avoid repeated scanning while looking for funcnameLibravatar René Scharfe1-24/+14
2010-07-05xdiff: optimise for no whitespace difference when ignoring whitespace.Libravatar Dylan Reid1-1/+3
2010-05-01xdiff/xmerge.c: use memset() instead of explicit for-loopLibravatar Alexey Mahotkin1-9/+8
2010-03-20xdl_merge(): move file1 and file2 labels to xmparam structureLibravatar Jonathan Nieder2-10/+14
2010-03-20xdl_merge(): add optional ancestor label to diff3-style outputLibravatar Jonathan Nieder2-2/+15
2010-03-02refactor merge flags into xmparam_tLibravatar Bert Wesarg2-12/+11
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 07:06:12 +0000