1. f0070a7 Merge branch 'rs/xdiff-ignore-ws-w-func-context' by Junio C Hamano · 5 years ago
  2. 0bb313a xdiff: unignore changes in function context by René Scharfe · 5 years ago
  3. 03d3b12 xdiffi: fix typos and touch up comments by Johannes Schindelin · 5 years ago
  4. d163b6a Merge branch 'cb/xdiff-no-system-includes-in-dot-c' by Junio C Hamano · 5 years ago
  5. c3d4c20 Merge branch 'jk/xdiff-clamp-funcname-context-index' by Junio C Hamano · 5 years ago
  6. 81ed2b4 xdiff: remove duplicate headers from xpatience.c by Carlo Marcelo Arenas Belón · 5 years ago
  7. 29a0f90 xdiff: remove duplicate headers from xhistogram.c by Carlo Marcelo Arenas Belón · 5 years ago
  8. 0d0e1e8 xdiff: drop system includes in xutils.c by Carlo Marcelo Arenas Belón · 5 years ago
  9. b777f3f xdiff: clamp function context indices in post-image by Jeff King · 6 years ago
  10. 36c8319 xdiff: use xmalloc/xrealloc by Jeff King · 6 years ago
  11. b46054b xdiff: use git-compat-util by Jeff King · 6 years ago
  12. 611e42a xdiff: provide a separate emit callback for hunks by Jeff King · 6 years ago
  13. 791ad49 Merge branch 'sb/indent-heuristic-optim' by Junio C Hamano · 6 years ago
  14. 57fbd8e Merge branch 'sb/histogram-less-memory' by Junio C Hamano · 6 years ago
  15. 301ef85 xdiff: reduce indent heuristic overhead by Stefan Beller · 6 years ago
  16. 79cb2eb xdiff/histogram: remove tail recursion by Stefan Beller · 7 years ago
  17. 64c4e8b xdiff/xhistogram: move index allocation into find_lcs by Stefan Beller · 7 years ago
  18. c671d4b xdiff/xhistogram: factor out memory cleanup into free_index() by Stefan Beller · 7 years ago
  19. 2820985 xdiff/xhistogram: pass arguments directly to fall_back_to_classic_diff by Stefan Beller · 7 years ago
  20. 21c770b xdiff/xdiffi.c: remove unneeded function declarations by Stefan Beller · 7 years ago
  21. 25790be xdiff/xdiff.h: remove unused flags by Stefan Beller · 7 years ago
  22. d7c6c23 Merge branch 'jt/diff-anchored-patience' by Junio C Hamano · 7 years ago
  23. f034901 Merge branch 'rs/include-comments-before-the-function-header' by Junio C Hamano · 7 years ago
  24. 2477ab2 diff: support anchoring line(s) by Jonathan Tan · 7 years ago
  25. 10f65c2 Merge branch 'jc/ignore-cr-at-eol' by Junio C Hamano · 7 years ago
  26. 5c3ed90 xdiff: show non-empty lines before functions with -W by René Scharfe · 7 years ago
  27. cde32bf xdiff: factor out is_func_rec() by René Scharfe · 7 years ago
  28. 4842579 Replace Free Software Foundation address in license notices by Todd Zullinger · 7 years ago
  29. e9282f0 diff: --ignore-cr-at-eol by Junio C Hamano · 7 years ago
  30. 446d12c xdiff: reassign xpparm_t.flags bits by Junio C Hamano · 7 years ago
  31. 19716b2 cleanup: fix possible overflow errors in binary search by Derrick Stolee · 7 years ago
  32. 540d3eb xdiff -W: relax end-of-file function detection by Vegard Nossum · 8 years ago
  33. 2ced5f2 Merge branch 'jc/retire-compaction-heuristics' by Junio C Hamano · 8 years ago
  34. 3cde4e0 diff: retire "compaction" heuristics by Junio C Hamano · 8 years ago
  35. 1f7c926 xdiff: drop XDL_FAST_HASH by Jeff King · 8 years ago
  36. e704c61 Merge branch 'mh/diff-indent-heuristic' by Junio C Hamano · 8 years ago
  37. ef4f0ca Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' into maint by Junio C Hamano · 8 years ago
  38. 134e40d xdiff: rename "struct group" to "struct xdlgroup" by Jeff King · 8 years ago
  39. b7af6ae Merge branch 'mh/diff-indent-heuristic' by Junio C Hamano · 8 years ago
  40. 4ed3863 Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' by Junio C Hamano · 8 years ago
  41. 433860f diff: improve positioning of add/delete blocks in diffs by Michael Haggerty · 8 years ago
  42. 45d2f75 xdiff: fix merging of hunks with -W context and -u context by René Scharfe · 8 years ago
  43. 5e4e5bb xdiff: remove unneeded declarations by Stefan Beller · 8 years ago
  44. e8adf23 xdl_change_compact(): introduce the concept of a change group by Michael Haggerty · 8 years ago
  45. 152598c recs_match(): take two xrecord_t pointers as arguments by Michael Haggerty · 8 years ago
  46. c06c0b6 is_blank_line(): take a single xrecord_t as argument by Michael Haggerty · 8 years ago
  47. cb0eded xdl_change_compact(): only use heuristic if group can't be matched by Michael Haggerty · 8 years ago
  48. a8fd78c xdl_change_compact(): fix compaction heuristic to adjust ixo by Michael Haggerty · 8 years ago
  49. a52fb9b Merge branch 'js/ignore-space-at-eol' into maint by Junio C Hamano · 8 years ago
  50. 044fb19 diff: fix a double off-by-one with --ignore-space-at-eol by Johannes Schindelin · 9 years ago
  51. fda65fa Merge branch 'rs/xdiff-hunk-with-func-line' into maint by Junio C Hamano · 9 years ago
  52. d15c05a Merge branch 'rs/xdiff-hunk-with-func-line' by Junio C Hamano · 9 years ago
  53. 6f8d9bc xdiff: fix merging of appended hunk with -W by René Scharfe · 9 years ago
  54. 9e6a4cf xdiff: -W: don't include common trailing empty lines in context by René Scharfe · 9 years ago
  55. 392f6d3 xdiff: ignore empty lines before added functions with -W by René Scharfe · 9 years ago
  56. 6d5badb xdiff: handle appended chunks better with -W by René Scharfe · 9 years ago
  57. ff2981f xdiff: factor out match_func_rec() by René Scharfe · 9 years ago
  58. 0018da1 Merge branch 'jk/diff-compact-heuristic' by Junio C Hamano · 9 years ago
  59. d634d61 xdiff: implement empty line chunk heuristic by Stefan Beller · 9 years ago
  60. 92e5b62 xdiff: add recs_match helper function by Jacob Keller · 9 years ago
  61. aa3a2c2 Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' by Junio C Hamano · 9 years ago
  62. 87f1625 xdiff/xprepare: fix a memory leak by Ramsay Jones · 9 years ago
  63. 5cd6978 xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits by Ramsay Jones · 9 years ago
  64. c1fa85f Merge branch 'ps/plug-xdl-merge-leak' by Junio C Hamano · 9 years ago
  65. 18b26b1 Merge branch 'jk/no-diff-emit-common' by Junio C Hamano · 9 years ago
  66. 4867f11 xdiff/xmerge: fix memory leak in xdl_merge by Patrick Steinhardt · 9 years ago
  67. 907681e xdiff: drop XDL_EMIT_COMMON by Jeff King · 9 years ago
  68. 15980de merge-file: ensure that conflict sections match eol style by Johannes Schindelin · 9 years ago
  69. 86efa21 merge-file: let conflict markers match end-of-line style of the context by Johannes Schindelin · 9 years ago
  70. ba31180 git-merge-file: do not add LF at EOF while applying unrelated change by Max Kirillov · 11 years ago
  71. c01499e C: have space around && and || operators by Junio C Hamano · 11 years ago
  72. 36617af diff: add --ignore-blank-lines option by Antoine Pelisse · 12 years ago
  73. 41ccfdd Correct common spelling mistakes in comments and tests by Stefano Lattarini · 12 years ago
  74. 0bc8bea Merge branch 'rs/xdiff-fast-hash-fix' by Junio C Hamano · 13 years ago
  75. 8072766 xdiff: import new 32-bit version of count_masked_bytes() by René Scharfe · 13 years ago
  76. 7e356a9 xdiff: avoid more compiler warnings with XDL_FAST_HASH on 32-bit machines by René Scharfe · 13 years ago
  77. 9322ce2 xdiff: avoid compiler warnings with XDL_FAST_HASH on 32-bit machines by René Scharfe · 13 years ago
  78. be89977 xdiff: remove unused functions by René Scharfe · 13 years ago
  79. 3319e60 xdiff: remove emit_func() and xdi_diff_hunks() by René Scharfe · 13 years ago
  80. 467d348 xdiff: add hunk_func() by René Scharfe · 13 years ago
  81. 4d1f0ef Merge branch 'tr/xdiff-fast-hash' by Junio C Hamano · 13 years ago
  82. 6f1af02 xdiff: choose XDL_FAST_HASH code on sizeof(long) instead of __WORDSIZE by Thomas Rast · 13 years ago
  83. 86c340e Merge branch 'jc/diff-algo-cleanup' by Junio C Hamano · 13 years ago
  84. 6942efc xdiff: load full words in the inner loop of xdl_hash_record by Thomas Rast · 13 years ago
  85. 307ab20 xdiff: PATIENCE/HISTOGRAM are not independent option bits by Junio C Hamano · 13 years ago
  86. e5b0662 xdiff: remove XDL_PATCH_* macros by Junio C Hamano · 13 years ago
  87. 86e15ff Merge branch 'rs/diff-postimage-in-context' by Junio C Hamano · 13 years ago
  88. baf5aaa xdiff: print post-image for common records instead of pre-image by René Scharfe · 13 years ago
  89. 9b55aa0 Merge branch 'rs/diff-whole-function' by Junio C Hamano · 13 years ago
  90. 7a63a92 Merge branch 'rs/diff-cleanup-records-fix' by Junio C Hamano · 13 years ago
  91. 14937c2 diff: add option to show whole functions as context by René Scharfe · 13 years ago
  92. f99f4b3 xdiff: factor out get_func_line() by René Scharfe · 13 years ago
  93. c5aa906 Revert removal of multi-match discard heuristic in 27af01 by René Scharfe · 13 years ago
  94. b648557 Merge branch 'rc/histogram-diff' by Junio C Hamano · 13 years ago
  95. 2738bc3 xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env() by Tay Ray Chuan · 13 years ago
  96. b14b969 Merge branch 'rc/histogram-diff' into HEAD by Junio C Hamano · 13 years ago
  97. 27af01d xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records() by Tay Ray Chuan · 13 years ago
  98. 6486a84 xdiff/xhistogram: drop need for additional variable by Tay Ray Chuan · 13 years ago
  99. 43ca753 xdiff/xhistogram: rely on xdl_trim_ends() by Tay Ray Chuan · 13 years ago
  100. 19f7a9c xdiff/xhistogram: rework handling of recursed results by Tay Ray Chuan · 13 years ago