| Commit message (Expand) | Author | Age |
* | Merge branch 'rs/include-comments-before-the-function-header' | Junio C Hamano | 2017-11-28 |
|\ |
|
| * | xdiff: show non-empty lines before functions with -W | René Scharfe | 2017-11-21 |
| * | xdiff: factor out is_func_rec() | René Scharfe | 2017-11-21 |
* | | Merge branch 'jc/ignore-cr-at-eol' | Junio C Hamano | 2017-11-27 |
|\ \
| |/
|/| |
|
| * | diff: --ignore-cr-at-eol | Junio C Hamano | 2017-11-08 |
| * | xdiff: reassign xpparm_t.flags bits | Junio C Hamano | 2017-10-27 |
* | | Replace Free Software Foundation address in license notices | Todd Zullinger | 2017-11-09 |
* | | cleanup: fix possible overflow errors in binary search | Derrick Stolee | 2017-10-10 |
|/ |
|
* | xdiff -W: relax end-of-file function detection | Vegard Nossum | 2017-01-15 |
* | Merge branch 'jc/retire-compaction-heuristics' | Junio C Hamano | 2017-01-10 |
|\ |
|
| * | diff: retire "compaction" heuristics | Junio C Hamano | 2016-12-23 |
* | | xdiff: drop XDL_FAST_HASH | Jeff King | 2016-12-06 |
|/ |
|
* | Merge branch 'mh/diff-indent-heuristic' | Junio C Hamano | 2016-10-03 |
|\ |
|
| * | xdiff: rename "struct group" to "struct xdlgroup" | Jeff King | 2016-09-27 |
* | | Merge branch 'mh/diff-indent-heuristic' | Junio C Hamano | 2016-09-26 |
|\ \
| |/ |
|
| * | diff: improve positioning of add/delete blocks in diffs | Michael Haggerty | 2016-09-19 |
| * | xdl_change_compact(): introduce the concept of a change group | Michael Haggerty | 2016-08-23 |
| * | recs_match(): take two xrecord_t pointers as arguments | Michael Haggerty | 2016-08-23 |
| * | is_blank_line(): take a single xrecord_t as argument | Michael Haggerty | 2016-08-23 |
| * | xdl_change_compact(): only use heuristic if group can't be matched | Michael Haggerty | 2016-08-23 |
| * | xdl_change_compact(): fix compaction heuristic to adjust ixo | Michael Haggerty | 2016-08-23 |
| * | Merge branch 'rs/xdiff-hunk-with-func-line' | Junio C Hamano | 2016-06-20 |
| |\ |
|
* | \ | Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' | Junio C Hamano | 2016-09-21 |
|\ \ \ |
|
| * | | | xdiff: fix merging of hunks with -W context and -u context | René Scharfe | 2016-09-14 |
* | | | | xdiff: remove unneeded declarations | Stefan Beller | 2016-09-07 |
|/ / / |
|
* | | | Merge branch 'js/ignore-space-at-eol' into maint | Junio C Hamano | 2016-08-08 |
|\ \ \ |
|
| * | | | diff: fix a double off-by-one with --ignore-space-at-eol | Johannes Schindelin | 2016-07-11 |
* | | | | Merge branch 'rs/xdiff-hunk-with-func-line' into maint | Junio C Hamano | 2016-06-27 |
|\ \ \ \
| |_|/ /
|/| | /
| | |/
| |/| |
|
| * | | xdiff: fix merging of appended hunk with -W | René Scharfe | 2016-06-09 |
| * | | xdiff: -W: don't include common trailing empty lines in context | René Scharfe | 2016-05-31 |
| * | | xdiff: ignore empty lines before added functions with -W | René Scharfe | 2016-05-31 |
| * | | xdiff: handle appended chunks better with -W | René Scharfe | 2016-05-31 |
| * | | xdiff: factor out match_func_rec() | René Scharfe | 2016-05-31 |
* | | | Merge branch 'jk/diff-compact-heuristic' | Junio C Hamano | 2016-05-06 |
|\ \ \ |
|
| * | | | xdiff: implement empty line chunk heuristic | Stefan Beller | 2016-04-19 |
| * | | | xdiff: add recs_match helper function | Jacob Keller | 2016-04-18 |
| | |/
| |/| |
|
* | | | Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' | Junio C Hamano | 2016-04-03 |
|\ \ \
| |_|/
|/| | |
|
| * | | xdiff/xprepare: fix a memory leak | Ramsay Jones | 2016-03-04 |
| * | | xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits | Ramsay Jones | 2016-03-04 |
| |/ |
|
* | | Merge branch 'ps/plug-xdl-merge-leak' | Junio C Hamano | 2016-02-26 |
|\ \ |
|
| * | | xdiff/xmerge: fix memory leak in xdl_merge | Patrick Steinhardt | 2016-02-23 |
| |/ |
|
* | | Merge branch 'jk/no-diff-emit-common' | Junio C Hamano | 2016-02-26 |
|\ \ |
|
| * | | xdiff: drop XDL_EMIT_COMMON | Jeff King | 2016-02-22 |
| |/ |
|
* | | merge-file: ensure that conflict sections match eol style | Johannes Schindelin | 2016-01-27 |
* | | merge-file: let conflict markers match end-of-line style of the context | Johannes Schindelin | 2016-01-27 |
|/ |
|
* | git-merge-file: do not add LF at EOF while applying unrelated change | Max Kirillov | 2014-06-30 |
* | C: have space around && and || operators | Junio C Hamano | 2013-10-16 |
* | diff: add --ignore-blank-lines option | Antoine Pelisse | 2013-06-19 |
* | Correct common spelling mistakes in comments and tests | Stefano Lattarini | 2013-04-12 |
* | Merge branch 'rs/xdiff-fast-hash-fix' | Junio C Hamano | 2012-05-25 |
|\ |
|