summaryrefslogtreecommitdiff
path: root/xdiff
AgeCommit message (Expand)AuthorFilesLines
2016-09-29Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' into maintLibravatar Junio C Hamano1-1/+1
2016-09-14xdiff: fix merging of hunks with -W context and -u contextLibravatar René Scharfe1-1/+1
2016-09-07xdiff: remove unneeded declarationsLibravatar Stefan Beller1-9/+0
2016-08-08Merge branch 'js/ignore-space-at-eol' into maintLibravatar Junio C Hamano2-3/+5
2016-07-11diff: fix a double off-by-one with --ignore-space-at-eolLibravatar Johannes Schindelin2-3/+5
2016-06-27Merge branch 'rs/xdiff-hunk-with-func-line' into maintLibravatar Junio C Hamano1-8/+57
2016-06-09xdiff: fix merging of appended hunk with -WLibravatar René Scharfe1-1/+2
2016-05-31xdiff: -W: don't include common trailing empty lines in contextLibravatar René Scharfe1-0/+2
2016-05-31xdiff: ignore empty lines before added functions with -WLibravatar René Scharfe1-2/+20
2016-05-31xdiff: handle appended chunks better with -WLibravatar René Scharfe1-3/+24
2016-05-31xdiff: factor out match_func_rec()Libravatar René Scharfe1-4/+11
2016-05-06Merge branch 'jk/diff-compact-heuristic'Libravatar Junio C Hamano2-4/+38
2016-04-19xdiff: implement empty line chunk heuristicLibravatar Stefan Beller2-0/+28
2016-04-18xdiff: add recs_match helper functionLibravatar Jacob Keller1-4/+10
2016-04-03Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath'Libravatar Junio C Hamano1-1/+2
2016-03-04xdiff/xprepare: fix a memory leakLibravatar Ramsay Jones1-0/+1
2016-03-04xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bitsLibravatar Ramsay Jones1-1/+1
2016-02-26Merge branch 'ps/plug-xdl-merge-leak'Libravatar Junio C Hamano1-2/+7
2016-02-26Merge branch 'jk/no-diff-emit-common'Libravatar Junio C Hamano2-19/+0
2016-02-23xdiff/xmerge: fix memory leak in xdl_mergeLibravatar Patrick Steinhardt1-2/+7
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 11:34:22 +0000