| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'jt/diff-anchored-patience' | Junio C Hamano | 2017-12-19 | 2 | -5/+41 |
|\ |
|
| * | diff: support anchoring line(s)jt/diff-anchored-patience | Jonathan Tan | 2017-11-28 | 2 | -5/+41 |
* | | Merge branch 'rs/include-comments-before-the-function-header' | Junio C Hamano | 2017-11-28 | 1 | -3/+10 |
|\ \
| |/
|/| |
|
| * | xdiff: show non-empty lines before functions with -W | René Scharfe | 2017-11-21 | 1 | -0/+3 |
| * | xdiff: factor out is_func_rec() | René Scharfe | 2017-11-21 | 1 | -3/+7 |
* | | Merge branch 'jc/ignore-cr-at-eol' | Junio C Hamano | 2017-11-27 | 2 | -12/+52 |
|\ \
| |/
|/| |
|
| * | diff: --ignore-cr-at-eoljc/ignore-cr-at-eol | Junio C Hamano | 2017-11-08 | 2 | -3/+39 |
| * | xdiff: reassign xpparm_t.flags bits | Junio C Hamano | 2017-10-27 | 1 | -10/+14 |
* | | Replace Free Software Foundation address in license notices | Todd Zullinger | 2017-11-09 | 14 | -28/+28 |
* | | cleanup: fix possible overflow errors in binary searchds/avoid-overflow-in-midpoint-computation | Derrick Stolee | 2017-10-10 | 1 | -1/+1 |
|/ |
|
* | xdiff -W: relax end-of-file function detectionvn/xdiff-func-context | Vegard Nossum | 2017-01-15 | 1 | -8/+6 |
* | Merge branch 'jc/retire-compaction-heuristics' | Junio C Hamano | 2017-01-10 | 2 | -35/+1 |
|\ |
|
| * | diff: retire "compaction" heuristicsjc/retire-compaction-heuristics | Junio C Hamano | 2016-12-23 | 2 | -35/+1 |
* | | xdiff: drop XDL_FAST_HASHjk/xdiff-drop-xdl-fast-hash | Jeff King | 2016-12-06 | 1 | -106/+0 |
|/ |
|
* | Merge branch 'mh/diff-indent-heuristic' | Junio C Hamano | 2016-10-03 | 1 | -7/+7 |
|\ |
|
| * | xdiff: rename "struct group" to "struct xdlgroup"mh/diff-indent-heuristic | Jeff King | 2016-09-27 | 1 | -7/+7 |
* | | Merge branch 'mh/diff-indent-heuristic' | Junio C Hamano | 2016-09-26 | 2 | -98/+538 |
|\ \
| |/ |
|
| * | diff: improve positioning of add/delete blocks in diffs | Michael Haggerty | 2016-09-19 | 2 | -0/+326 |
| * | xdl_change_compact(): introduce the concept of a change group | Michael Haggerty | 2016-08-23 | 1 | -90/+203 |
| * | recs_match(): take two xrecord_t pointers as arguments | Michael Haggerty | 2016-08-23 | 1 | -7/+7 |
| * | is_blank_line(): take a single xrecord_t as argument | Michael Haggerty | 2016-08-23 | 1 | -4/+4 |
| * | xdl_change_compact(): only use heuristic if group can't be matched | Michael Haggerty | 2016-08-23 | 1 | -19/+19 |
| * | xdl_change_compact(): fix compaction heuristic to adjust ixo | Michael Haggerty | 2016-08-23 | 1 | -0/+1 |
| * | Merge branch 'rs/xdiff-hunk-with-func-line' | Junio C Hamano | 2016-06-20 | 1 | -8/+57 |
| |\ |
|
* | \ | Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' | Junio C Hamano | 2016-09-21 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | xdiff: fix merging of hunks with -W context and -u contextrs/xdiff-merge-overlapping-hunks-for-W-context | René Scharfe | 2016-09-14 | 1 | -1/+1 |
* | | | | xdiff: remove unneeded declarationssb/xdiff-remove-unused-static-decl | Stefan Beller | 2016-09-07 | 1 | -9/+0 |
|/ / / |
|
* | | | Merge branch 'js/ignore-space-at-eol' into maint | Junio C Hamano | 2016-08-08 | 2 | -3/+5 |
|\ \ \ |
|
| * | | | diff: fix a double off-by-one with --ignore-space-at-eoljs/ignore-space-at-eol | Johannes Schindelin | 2016-07-11 | 2 | -3/+5 |
* | | | | Merge branch 'rs/xdiff-hunk-with-func-line' into maint | Junio C Hamano | 2016-06-27 | 1 | -8/+57 |
|\ \ \ \
| |_|/ /
|/| | /
| | |/
| |/| |
|
| * | | xdiff: fix merging of appended hunk with -Wrs/xdiff-hunk-with-func-line | René Scharfe | 2016-06-09 | 1 | -1/+2 |
| * | | xdiff: -W: don't include common trailing empty lines in context | René Scharfe | 2016-05-31 | 1 | -0/+2 |
| * | | xdiff: ignore empty lines before added functions with -W | René Scharfe | 2016-05-31 | 1 | -2/+20 |
| * | | xdiff: handle appended chunks better with -W | René Scharfe | 2016-05-31 | 1 | -3/+24 |
| * | | xdiff: factor out match_func_rec() | René Scharfe | 2016-05-31 | 1 | -4/+11 |
* | | | Merge branch 'jk/diff-compact-heuristic' | Junio C Hamano | 2016-05-06 | 2 | -4/+38 |
|\ \ \ |
|
| * | | | xdiff: implement empty line chunk heuristic | Stefan Beller | 2016-04-19 | 2 | -0/+28 |
| * | | | xdiff: add recs_match helper function | Jacob Keller | 2016-04-18 | 1 | -4/+10 |
| | |/
| |/| |
|
* | | | Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' | Junio C Hamano | 2016-04-03 | 1 | -1/+2 |
|\ \ \
| |_|/
|/| | |
|
| * | | xdiff/xprepare: fix a memory leakrj/xdiff-prepare-plug-leak-on-error-codepath | Ramsay Jones | 2016-03-04 | 1 | -0/+1 |
| * | | xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits | Ramsay Jones | 2016-03-04 | 1 | -1/+1 |
| |/ |
|
* | | Merge branch 'ps/plug-xdl-merge-leak' | Junio C Hamano | 2016-02-26 | 1 | -2/+7 |
|\ \ |
|
| * | | xdiff/xmerge: fix memory leak in xdl_mergeps/plug-xdl-merge-leak | Patrick Steinhardt | 2016-02-23 | 1 | -2/+7 |
| |/ |
|
* | | Merge branch 'jk/no-diff-emit-common' | Junio C Hamano | 2016-02-26 | 2 | -19/+0 |
|\ \ |
|
| * | | xdiff: drop XDL_EMIT_COMMONjk/no-diff-emit-common | Jeff King | 2016-02-22 | 2 | -19/+0 |
| |/ |
|
* | | merge-file: ensure that conflict sections match eol stylejs/xmerge-marker-eol | Johannes Schindelin | 2016-01-27 | 1 | -14/+23 |
* | | merge-file: let conflict markers match end-of-line style of the context | Johannes Schindelin | 2016-01-27 | 1 | -4/+57 |
|/ |
|
* | git-merge-file: do not add LF at EOF while applying unrelated changemk/merge-incomplete-files | Max Kirillov | 2014-06-30 | 1 | -2/+2 |
* | C: have space around && and || operators | Junio C Hamano | 2013-10-16 | 1 | -1/+1 |
* | diff: add --ignore-blank-lines option | Antoine Pelisse | 2013-06-19 | 7 | -8/+89 |