Age | Commit message (Expand) | Author | Files | Lines |
2016-09-21 | Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' | Junio C Hamano | 1 | -1/+1 |
2016-09-14 | xdiff: fix merging of hunks with -W context and -u context | René Scharfe | 1 | -1/+1 |
2016-09-07 | xdiff: remove unneeded declarations | Stefan Beller | 1 | -9/+0 |
2016-08-08 | Merge branch 'js/ignore-space-at-eol' into maint | Junio C Hamano | 2 | -3/+5 |
2016-07-11 | diff: fix a double off-by-one with --ignore-space-at-eol | Johannes Schindelin | 2 | -3/+5 |
2016-06-27 | Merge branch 'rs/xdiff-hunk-with-func-line' into maint | Junio C Hamano | 1 | -8/+57 |
2016-06-09 | xdiff: fix merging of appended hunk with -W | René Scharfe | 1 | -1/+2 |
2016-05-31 | xdiff: -W: don't include common trailing empty lines in context | René Scharfe | 1 | -0/+2 |
2016-05-31 | xdiff: ignore empty lines before added functions with -W | René Scharfe | 1 | -2/+20 |
2016-05-31 | xdiff: handle appended chunks better with -W | René Scharfe | 1 | -3/+24 |
2016-05-31 | xdiff: factor out match_func_rec() | René Scharfe | 1 | -4/+11 |
2016-05-06 | Merge branch 'jk/diff-compact-heuristic' | Junio C Hamano | 2 | -4/+38 |
2016-04-19 | xdiff: implement empty line chunk heuristic | Stefan Beller | 2 | -0/+28 |
2016-04-18 | xdiff: add recs_match helper function | Jacob Keller | 1 | -4/+10 |
2016-04-03 | Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' | Junio C Hamano | 1 | -1/+2 |
2016-03-04 | xdiff/xprepare: fix a memory leak | Ramsay Jones | 1 | -0/+1 |
2016-03-04 | xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits | Ramsay Jones | 1 | -1/+1 |
2016-02-26 | Merge branch 'ps/plug-xdl-merge-leak' | Junio C Hamano | 1 | -2/+7 |
2016-02-26 | Merge branch 'jk/no-diff-emit-common' | Junio C Hamano | 2 | -19/+0 |
2016-02-23 | xdiff/xmerge: fix memory leak in xdl_merge | Patrick Steinhardt | 1 | -2/+7 |
2016-02-22 | xdiff: drop XDL_EMIT_COMMON | Jeff King | 2 | -19/+0 |
2016-01-27 | merge-file: ensure that conflict sections match eol style | Johannes Schindelin | 1 | -14/+23 |
2016-01-27 | merge-file: let conflict markers match end-of-line style of the context | Johannes Schindelin | 1 | -4/+57 |
2014-06-30 | git-merge-file: do not add LF at EOF while applying unrelated change | Max Kirillov | 1 | -2/+2 |
2013-10-16 | C: have space around && and || operators | Junio C Hamano | 1 | -1/+1 |
2013-06-19 | diff: add --ignore-blank-lines option | Antoine Pelisse | 7 | -8/+89 |
2013-04-12 | Correct common spelling mistakes in comments and tests | Stefano Lattarini | 2 | -2/+2 |
2012-05-25 | Merge branch 'rs/xdiff-fast-hash-fix' | Junio C Hamano | 1 | -15/+15 |
2012-05-23 | xdiff: import new 32-bit version of count_masked_bytes() | René Scharfe | 1 | -13/+5 |
2012-05-23 | xdiff: avoid more compiler warnings with XDL_FAST_HASH on 32-bit machines | René Scharfe | 1 | -1/+7 |
2012-05-22 | xdiff: avoid compiler warnings with XDL_FAST_HASH on 32-bit machines | René Scharfe | 1 | -3/+5 |
2012-05-09 | xdiff: remove unused functions | René Scharfe | 2 | -46/+0 |
2012-05-09 | xdiff: remove emit_func() and xdi_diff_hunks() | René Scharfe | 2 | -6/+1 |
2012-05-09 | xdiff: add hunk_func() | René Scharfe | 2 | -0/+22 |
2012-05-02 | Merge branch 'tr/xdiff-fast-hash' | Junio C Hamano | 1 | -0/+106 |
2012-05-01 | xdiff: choose XDL_FAST_HASH code on sizeof(long) instead of __WORDSIZE | Thomas Rast | 1 | -29/+23 |
2012-04-15 | Merge branch 'jc/diff-algo-cleanup' | Junio C Hamano | 5 | -21/+18 |
2012-04-09 | xdiff: load full words in the inner loop of xdl_hash_record | Thomas Rast | 1 | -0/+112 |
2012-02-19 | xdiff: PATIENCE/HISTOGRAM are not independent option bits | Junio C Hamano | 5 | -16/+18 |
2012-02-19 | xdiff: remove XDL_PATCH_* macros | Junio C Hamano | 1 | -5/+0 |
2012-01-29 | Merge branch 'rs/diff-postimage-in-context' | Junio C Hamano | 1 | -6/+6 |
2012-01-06 | xdiff: print post-image for common records instead of pre-image | René Scharfe | 1 | -6/+6 |
2011-10-19 | Merge branch 'rs/diff-whole-function' | Junio C Hamano | 2 | -16/+70 |
2011-10-13 | Merge branch 'rs/diff-cleanup-records-fix' | Junio C Hamano | 1 | -3/+7 |
2011-10-10 | diff: add option to show whole functions as context | René Scharfe | 2 | -6/+49 |
2011-10-10 | xdiff: factor out get_func_line() | René Scharfe | 1 | -16/+27 |
2011-09-26 | Revert removal of multi-match discard heuristic in 27af01 | René Scharfe | 1 | -3/+7 |
2011-09-06 | Merge branch 'rc/histogram-diff' | Junio C Hamano | 1 | -0/+2 |
2011-08-31 | xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env() | Tay Ray Chuan | 1 | -0/+2 |
2011-08-17 | Merge branch 'rc/histogram-diff' into HEAD | Junio C Hamano | 8 | -125/+470 |