1. ba31180 git-merge-file: do not add LF at EOF while applying unrelated change by Max Kirillov · 11 years ago
  2. c01499e C: have space around && and || operators by Junio C Hamano · 11 years ago
  3. 36617af diff: add --ignore-blank-lines option by Antoine Pelisse · 12 years ago
  4. 41ccfdd Correct common spelling mistakes in comments and tests by Stefano Lattarini · 12 years ago
  5. 0bc8bea Merge branch 'rs/xdiff-fast-hash-fix' by Junio C Hamano · 13 years ago
  6. 8072766 xdiff: import new 32-bit version of count_masked_bytes() by René Scharfe · 13 years ago
  7. 7e356a9 xdiff: avoid more compiler warnings with XDL_FAST_HASH on 32-bit machines by René Scharfe · 13 years ago
  8. 9322ce2 xdiff: avoid compiler warnings with XDL_FAST_HASH on 32-bit machines by René Scharfe · 13 years ago
  9. be89977 xdiff: remove unused functions by René Scharfe · 13 years ago
  10. 3319e60 xdiff: remove emit_func() and xdi_diff_hunks() by René Scharfe · 13 years ago
  11. 467d348 xdiff: add hunk_func() by René Scharfe · 13 years ago
  12. 4d1f0ef Merge branch 'tr/xdiff-fast-hash' by Junio C Hamano · 13 years ago
  13. 6f1af02 xdiff: choose XDL_FAST_HASH code on sizeof(long) instead of __WORDSIZE by Thomas Rast · 13 years ago
  14. 86c340e Merge branch 'jc/diff-algo-cleanup' by Junio C Hamano · 13 years ago
  15. 6942efc xdiff: load full words in the inner loop of xdl_hash_record by Thomas Rast · 13 years ago
  16. 307ab20 xdiff: PATIENCE/HISTOGRAM are not independent option bits by Junio C Hamano · 13 years ago
  17. e5b0662 xdiff: remove XDL_PATCH_* macros by Junio C Hamano · 13 years ago
  18. 86e15ff Merge branch 'rs/diff-postimage-in-context' by Junio C Hamano · 13 years ago
  19. baf5aaa xdiff: print post-image for common records instead of pre-image by René Scharfe · 13 years ago
  20. 9b55aa0 Merge branch 'rs/diff-whole-function' by Junio C Hamano · 13 years ago
  21. 7a63a92 Merge branch 'rs/diff-cleanup-records-fix' by Junio C Hamano · 13 years ago
  22. 14937c2 diff: add option to show whole functions as context by René Scharfe · 13 years ago
  23. f99f4b3 xdiff: factor out get_func_line() by René Scharfe · 13 years ago
  24. c5aa906 Revert removal of multi-match discard heuristic in 27af01 by René Scharfe · 13 years ago
  25. b648557 Merge branch 'rc/histogram-diff' by Junio C Hamano · 13 years ago
  26. 2738bc3 xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env() by Tay Ray Chuan · 13 years ago
  27. b14b969 Merge branch 'rc/histogram-diff' into HEAD by Junio C Hamano · 14 years ago
  28. 27af01d xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records() by Tay Ray Chuan · 14 years ago
  29. 6486a84 xdiff/xhistogram: drop need for additional variable by Tay Ray Chuan · 14 years ago
  30. 43ca753 xdiff/xhistogram: rely on xdl_trim_ends() by Tay Ray Chuan · 14 years ago
  31. 19f7a9c xdiff/xhistogram: rework handling of recursed results by Tay Ray Chuan · 14 years ago
  32. 739864b xdiff: do away with xdl_mmfile_next() by Tay Ray Chuan · 14 years ago
  33. 86abba8 xdiff/xprepare: use a smaller sample size for histogram diff by Tay Ray Chuan · 14 years ago
  34. 9f37c27 xdiff/xprepare: skip classification by Tay Ray Chuan · 14 years ago
  35. 8c912ee teach --histogram to diff by Tay Ray Chuan · 14 years ago
  36. 1d26b25 xdiff/xpatience: factor out fall-back-diff function by Tay Ray Chuan · 14 years ago
  37. 159607a xdiff/xprepare: refactor abort cleanups by Tay Ray Chuan · 14 years ago
  38. 452f4fa xdiff/xprepare: use memset() by Tay Ray Chuan · 14 years ago
  39. 8cf666c Merge branch 'cb/diff-fname-optim' by Junio C Hamano · 14 years ago
  40. 349362c xdiff: cast arguments for ctype functions to unsigned char by Jonathan Nieder · 14 years ago
  41. c099789 diff: avoid repeated scanning while looking for funcname by René Scharfe · 14 years ago
  42. b4cf0f1 xdiff: optimise for no whitespace difference when ignoring whitespace. by Dylan Reid · 15 years ago
  43. c8c073c xdiff/xmerge.c: use memset() instead of explicit for-loop by Alexey Mahotkin · 15 years ago
  44. a4b5e91 xdl_merge(): move file1 and file2 labels to xmparam structure by Jonathan Nieder · 15 years ago
  45. 8a16143 xdl_merge(): add optional ancestor label to diff3-style output by Jonathan Nieder · 15 years ago
  46. 560119b refactor merge flags into xmparam_t by Bert Wesarg · 15 years ago
  47. cd1d61c make union merge an xdl merge favor by Bert Wesarg · 15 years ago
  48. 06dbc1e Merge branch 'jc/conflict-marker-size' by Junio C Hamano · 15 years ago
  49. 9914cf4 xdl_merge(): allow passing down marker_size in xmparam_t by Junio C Hamano · 15 years ago
  50. 00f8f97 xdl_merge(): introduce xmparam_t for merge specific parameters by Junio C Hamano · 15 years ago
  51. 73eb40e git-merge-file --ours, --theirs by Junio C Hamano · 17 years ago
  52. d34eca0 Merge branch 'tf/diff-whitespace-incomplete-line' by Junio C Hamano · 15 years ago
  53. 3b5ef0e xutils: Fix xdl_recmatch() on incomplete lines by Junio C Hamano · 15 years ago
  54. 78ed710 xutils: Fix hashing an incomplete line with whitespaces at the end by Junio C Hamano · 15 years ago
  55. f630cfd refactor: use bitsizeof() instead of 8 * sizeof() by Pierre Habouzit · 16 years ago
  56. 456cb4c Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint by Junio C Hamano · 16 years ago
  57. 5719db9 Change xdl_merge to generate output even for null merges by Charles Bailey · 16 years ago
  58. 3ea3c21 Fix typos / spelling in comments by Mike Ralphson · 16 years ago
  59. 8e24cba Fix various dead stores found by the clang static analyzer by Benjamin Kramer · 16 years ago
  60. 8c4c286 Merge branch 'kc/maint-diff-bwi-fix' into maint by Junio C Hamano · 16 years ago
  61. 5dc1308 Merge branch 'js/patience-diff' by Junio C Hamano · 16 years ago
  62. 9a01387 Merge branch 'kc/maint-diff-bwi-fix' by Junio C Hamano · 16 years ago
  63. 6d12ace Fix combined use of whitespace ignore options to diff by Keith Cascio · 16 years ago
  64. 92b7de9 Implement the patience diff algorithm by Johannes Schindelin · 16 years ago
  65. 6d0e674 diff: add option to show context between close hunks by René Scharfe · 16 years ago
  66. 733070b xdiff: give up scanning similar lines early by Davide Libenzi · 16 years ago
  67. ac2abb4 Merge branch 'dl/xdiff' by Junio C Hamano · 16 years ago
  68. 9b28d55 xdiff: give up scanning similar lines early by Davide Libenzi · 16 years ago
  69. ef2e62f Allow alternate "low-level" emit function from xdl_diff by Brian Downing · 16 years ago
  70. 8313374 xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less by Junio C Hamano · 16 years ago
  71. 838338c xmerge.c: minimum readability fixups by Junio C Hamano · 16 years ago
  72. e0af48e xdiff-merge: optionally show conflicts in "diff3 -m" style by Junio C Hamano · 16 years ago
  73. f2b25dd xdl_fill_merge_buffer(): separate out a too deeply nested function by Junio C Hamano · 16 years ago
  74. ee95ec5 xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM by Johannes Schindelin · 17 years ago
  75. f407f14 xdl_merge(): make XDL_MERGE_ZEALOUS output simpler by Johannes Schindelin · 17 years ago
  76. a777e9c Remove unreachable statements by Guido Ostkamp · 17 years ago
  77. f258475 Per-path attribute based hunk header selection. by Junio C Hamano · 18 years ago
  78. 52fae7d Missing statics. by Pierre Habouzit · 18 years ago
  79. a6080a0 War on whitespace by Junio C Hamano · 18 years ago
  80. 824f782 xdiff/xutils.c(xdl_hash_record): factor out whitespace handling by Johannes Schindelin · 18 years ago
  81. 859f9c4 teach diff machinery about --ignore-space-at-eol by Johannes Schindelin · 18 years ago
  82. 22b6abc Fix yet another subtle xdl_merge() bug by Johannes Schindelin · 18 years ago
  83. 5d6b151 xdl_merge(): fix a segmentation fault when refining conflicts by Johannes Schindelin · 18 years ago
  84. 8042ed1 Merge branch 'master' into js/merge by Junio C Hamano · 18 years ago
  85. 98e6da8 xdl_merge(): fix and simplify conflict handling by Johannes Schindelin · 18 years ago
  86. c7c2488 diff -b: ignore whitespace at end of line by Johannes Schindelin · 18 years ago
  87. 710daa8 xdl_merge(): fix thinko by Johannes Schindelin · 18 years ago
  88. 875b8ce xdl_merge(): fix an off-by-one bug by Johannes Schindelin · 18 years ago
  89. 53a7085 xmerge: make return value from xdl_merge() more usable. by Junio C Hamano · 18 years ago
  90. 857b933 xdiff: add xdl_merge() by Johannes Schindelin · 18 years ago
  91. f73da29 Increase length of function name buffer by Andy Parkins · 18 years ago
  92. 70da769 xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of lines by Petr Baudis · 18 years ago
  93. 67aef03 xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header. by Jim Meyering · 18 years ago
  94. 3453f86 Merge branch 'maint' by Junio C Hamano · 18 years ago
  95. 9de0834 Fix hash function in xdiff library by Linus Torvalds · 18 years ago v1.4.2.4
  96. 2344d47 diff: fix 2 whitespace issues by Johannes Schindelin · 18 years ago
  97. 096b173 Merge branch 'lt/merge-tree' by Junio C Hamano · 19 years ago
  98. 82e5a82 Fix more typos, primarily in the code by Pavel Roskin · 19 years ago
  99. a9ed376 xdiff: generate "anti-diffs" aka what is common to two files by Linus Torvalds · 19 years ago
  100. 0d21efa Teach diff about -b and -w flags by Johannes Schindelin · 19 years ago