Age | Commit message (Expand) | Author | Files | Lines |
2017-12-19 | Merge branch 'jt/diff-anchored-patience' | Junio C Hamano | 2 | -5/+41 |
2017-11-28 | Merge branch 'rs/include-comments-before-the-function-header' | Junio C Hamano | 1 | -3/+10 |
2017-11-28 | diff: support anchoring line(s) | Jonathan Tan | 2 | -5/+41 |
2017-11-27 | Merge branch 'jc/ignore-cr-at-eol' | Junio C Hamano | 2 | -12/+52 |
2017-11-21 | xdiff: show non-empty lines before functions with -W | René Scharfe | 1 | -0/+3 |
2017-11-21 | xdiff: factor out is_func_rec() | René Scharfe | 1 | -3/+7 |
2017-11-09 | Replace Free Software Foundation address in license notices | Todd Zullinger | 14 | -28/+28 |
2017-11-08 | diff: --ignore-cr-at-eol | Junio C Hamano | 2 | -3/+39 |
2017-10-27 | xdiff: reassign xpparm_t.flags bits | Junio C Hamano | 1 | -10/+14 |
2017-10-10 | cleanup: fix possible overflow errors in binary search | Derrick Stolee | 1 | -1/+1 |
2017-01-15 | xdiff -W: relax end-of-file function detection | Vegard Nossum | 1 | -8/+6 |
2017-01-10 | Merge branch 'jc/retire-compaction-heuristics' | Junio C Hamano | 2 | -35/+1 |
2016-12-23 | diff: retire "compaction" heuristics | Junio C Hamano | 2 | -35/+1 |
2016-12-06 | xdiff: drop XDL_FAST_HASH | Jeff King | 1 | -106/+0 |
2016-10-03 | Merge branch 'mh/diff-indent-heuristic' | Junio C Hamano | 1 | -7/+7 |
2016-09-27 | xdiff: rename "struct group" to "struct xdlgroup" | Jeff King | 1 | -7/+7 |
2016-09-26 | Merge branch 'mh/diff-indent-heuristic' | Junio C Hamano | 2 | -98/+538 |
2016-09-21 | Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' | Junio C Hamano | 1 | -1/+1 |
2016-09-19 | diff: improve positioning of add/delete blocks in diffs | Michael Haggerty | 2 | -0/+326 |
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-23 | xdl_change_compact(): introduce the concept of a change group | Michael Haggerty | 1 | -90/+203 |
2016-08-23 | recs_match(): take two xrecord_t pointers as arguments | Michael Haggerty | 1 | -7/+7 |
2016-08-23 | is_blank_line(): take a single xrecord_t as argument | Michael Haggerty | 1 | -4/+4 |
2016-08-23 | xdl_change_compact(): only use heuristic if group can't be matched | Michael Haggerty | 1 | -19/+19 |
2016-08-23 | xdl_change_compact(): fix compaction heuristic to adjust ixo | Michael Haggerty | 1 | -0/+1 |
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-20 | Merge branch 'rs/xdiff-hunk-with-func-line' | 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 |