| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'ab/pickaxe-pcre2' | Junio C Hamano | 2021-07-13 | 2 | -1/+3 |
|\ |
|
| * | xdiff-interface: replace discard_hunk_line() with a flag | Ævar Arnfjörð Bjarmason | 2021-05-11 | 2 | -1/+3 |
* | | Merge branch 'ab/xdiff-bug-cleanup' | Junio C Hamano | 2021-07-08 | 1 | -14/+8 |
|\ \ |
|
| * | | xdiff: use BUG(...), not xdl_bug(...) | Ævar Arnfjörð Bjarmason | 2021-06-08 | 1 | -14/+8 |
| |/ |
|
* | | Merge branch 'pw/patience-diff-clean-up' | Junio C Hamano | 2021-05-14 | 1 | -11/+3 |
|\ \
| |/
|/| |
|
| * | patience diff: remove unused variable | Phillip Wood | 2021-05-05 | 1 | -3/+0 |
| * | patience diff: remove unnecessary string comparisons | Phillip Wood | 2021-05-05 | 1 | -8/+3 |
* | | diff: add -I<regex> that ignores matching changes | Michał Kępień | 2020-10-20 | 2 | -2/+49 |
* | | merge-base, xdiff: zero out xpparam_t structures | Michał Kępień | 2020-10-20 | 2 | -0/+4 |
|/ |
|
* | Merge branch 'rs/xdiff-ignore-ws-w-func-context' | Junio C Hamano | 2019-12-16 | 1 | -0/+17 |
|\ |
|
| * | xdiff: unignore changes in function context | René Scharfe | 2019-12-05 | 1 | -0/+17 |
* | | xdiffi: fix typos and touch up comments | Johannes Schindelin | 2019-10-09 | 1 | -44/+55 |
|/ |
|
* | Merge branch 'cb/xdiff-no-system-includes-in-dot-c' | Junio C Hamano | 2019-07-31 | 3 | -8/+0 |
|\ |
|
| * | xdiff: remove duplicate headers from xpatience.c | Carlo Marcelo Arenas Belón | 2019-07-28 | 1 | -2/+0 |
| * | xdiff: remove duplicate headers from xhistogram.c | Carlo Marcelo Arenas Belón | 2019-07-28 | 1 | -2/+0 |
| * | xdiff: drop system includes in xutils.c | Carlo Marcelo Arenas Belón | 2019-07-28 | 1 | -4/+0 |
* | | Merge branch 'jk/xdiff-clamp-funcname-context-index' | Junio C Hamano | 2019-07-29 | 1 | -2/+2 |
|\ \
| |/
|/| |
|
| * | xdiff: clamp function context indices in post-image | Jeff King | 2019-07-23 | 1 | -2/+2 |
* | | xdiff: use xmalloc/xrealloc | Jeff King | 2019-04-12 | 1 | -2/+2 |
* | | xdiff: use git-compat-util | Jeff King | 2019-04-12 | 1 | -7/+1 |
|/ |
|
* | xdiff: provide a separate emit callback for hunks | Jeff King | 2018-11-02 | 2 | -5/+22 |
* | Merge branch 'sb/indent-heuristic-optim' | Junio C Hamano | 2018-08-17 | 1 | -1/+11 |
|\ |
|
| * | xdiff: reduce indent heuristic overhead | Stefan Beller | 2018-08-01 | 1 | -1/+11 |
* | | Merge branch 'sb/histogram-less-memory' | Junio C Hamano | 2018-08-15 | 1 | -55/+78 |
|\ \ |
|
| * | | xdiff/histogram: remove tail recursion | Stefan Beller | 2018-07-23 | 1 | -6/+14 |
| * | | xdiff/xhistogram: move index allocation into find_lcs | Stefan Beller | 2018-07-19 | 1 | -43/+53 |
| * | | xdiff/xhistogram: factor out memory cleanup into free_index() | Stefan Beller | 2018-07-19 | 1 | -4/+9 |
| * | | xdiff/xhistogram: pass arguments directly to fall_back_to_classic_diff | Stefan Beller | 2018-07-19 | 1 | -11/+11 |
| * | | Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' into maint | Junio C Hamano | 2016-09-29 | 1 | -1/+1 |
| |\ \ |
|
* | | | | xdiff/xdiffi.c: remove unneeded function declarations | Stefan Beller | 2018-07-17 | 1 | -17/+0 |
* | | | | xdiff/xdiff.h: remove unused flags | Stefan Beller | 2018-07-17 | 1 | -8/+0 |
| |_|/
|/| | |
|
* | | | 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 |