Google Git
Sign in
googlers / jrn / git / 9051198214d3e5ec325917d93116bec55addaf5b / xdiff
  1. 540d3eb xdiff -W: relax end-of-file function detection by Vegard Nossum · 8 years ago
  2. 2ced5f2 Merge branch 'jc/retire-compaction-heuristics' by Junio C Hamano · 8 years ago
  3. 3cde4e0 diff: retire "compaction" heuristics by Junio C Hamano · 8 years ago
  4. 1f7c926 xdiff: drop XDL_FAST_HASH by Jeff King · 8 years ago
  5. e704c61 Merge branch 'mh/diff-indent-heuristic' by Junio C Hamano · 8 years ago
  6. 134e40d xdiff: rename "struct group" to "struct xdlgroup" by Jeff King · 8 years ago
  7. b7af6ae Merge branch 'mh/diff-indent-heuristic' by Junio C Hamano · 8 years ago
  8. 4ed3863 Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' by Junio C Hamano · 8 years ago
  9. 433860f diff: improve positioning of add/delete blocks in diffs by Michael Haggerty · 9 years ago
  10. 45d2f75 xdiff: fix merging of hunks with -W context and -u context by René Scharfe · 8 years ago
  11. 5e4e5bb xdiff: remove unneeded declarations by Stefan Beller · 9 years ago
  12. e8adf23 xdl_change_compact(): introduce the concept of a change group by Michael Haggerty · 9 years ago
  13. 152598c recs_match(): take two xrecord_t pointers as arguments by Michael Haggerty · 9 years ago
  14. c06c0b6 is_blank_line(): take a single xrecord_t as argument by Michael Haggerty · 9 years ago
  15. cb0eded xdl_change_compact(): only use heuristic if group can't be matched by Michael Haggerty · 9 years ago
  16. a8fd78c xdl_change_compact(): fix compaction heuristic to adjust ixo by Michael Haggerty · 9 years ago
  17. a52fb9b Merge branch 'js/ignore-space-at-eol' into maint by Junio C Hamano · 9 years ago
  18. 044fb19 diff: fix a double off-by-one with --ignore-space-at-eol by Johannes Schindelin · 9 years ago
  19. fda65fa Merge branch 'rs/xdiff-hunk-with-func-line' into maint by Junio C Hamano · 9 years ago
  20. d15c05a Merge branch 'rs/xdiff-hunk-with-func-line' by Junio C Hamano · 9 years ago
  21. 6f8d9bc xdiff: fix merging of appended hunk with -W by René Scharfe · 9 years ago
  22. 9e6a4cf xdiff: -W: don't include common trailing empty lines in context by René Scharfe · 9 years ago
  23. 392f6d3 xdiff: ignore empty lines before added functions with -W by René Scharfe · 9 years ago
  24. 6d5badb xdiff: handle appended chunks better with -W by René Scharfe · 9 years ago
  25. ff2981f xdiff: factor out match_func_rec() by René Scharfe · 9 years ago
  26. 0018da1 Merge branch 'jk/diff-compact-heuristic' by Junio C Hamano · 9 years ago
  27. d634d61 xdiff: implement empty line chunk heuristic by Stefan Beller · 9 years ago
  28. 92e5b62 xdiff: add recs_match helper function by Jacob Keller · 9 years ago
  29. aa3a2c2 Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' by Junio C Hamano · 9 years ago
  30. 87f1625 xdiff/xprepare: fix a memory leak by Ramsay Jones · 9 years ago
  31. 5cd6978 xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits by Ramsay Jones · 9 years ago
  32. c1fa85f Merge branch 'ps/plug-xdl-merge-leak' by Junio C Hamano · 9 years ago
  33. 18b26b1 Merge branch 'jk/no-diff-emit-common' by Junio C Hamano · 9 years ago
  34. 4867f11 xdiff/xmerge: fix memory leak in xdl_merge by Patrick Steinhardt · 9 years ago
  35. 907681e xdiff: drop XDL_EMIT_COMMON by Jeff King · 9 years ago
  36. 15980de merge-file: ensure that conflict sections match eol style by Johannes Schindelin · 9 years ago
  37. 86efa21 merge-file: let conflict markers match end-of-line style of the context by Johannes Schindelin · 9 years ago
  38. ba31180 git-merge-file: do not add LF at EOF while applying unrelated change by Max Kirillov · 11 years ago
  39. c01499e C: have space around && and || operators by Junio C Hamano · 11 years ago
  40. 36617af diff: add --ignore-blank-lines option by Antoine Pelisse · 12 years ago
  41. 41ccfdd Correct common spelling mistakes in comments and tests by Stefano Lattarini · 12 years ago
  42. 0bc8bea Merge branch 'rs/xdiff-fast-hash-fix' by Junio C Hamano · 13 years ago
  43. 8072766 xdiff: import new 32-bit version of count_masked_bytes() by René Scharfe · 13 years ago
  44. 7e356a9 xdiff: avoid more compiler warnings with XDL_FAST_HASH on 32-bit machines by René Scharfe · 13 years ago
  45. 9322ce2 xdiff: avoid compiler warnings with XDL_FAST_HASH on 32-bit machines by René Scharfe · 13 years ago
  46. be89977 xdiff: remove unused functions by René Scharfe · 13 years ago
  47. 3319e60 xdiff: remove emit_func() and xdi_diff_hunks() by René Scharfe · 13 years ago
  48. 467d348 xdiff: add hunk_func() by René Scharfe · 13 years ago
  49. 4d1f0ef Merge branch 'tr/xdiff-fast-hash' by Junio C Hamano · 13 years ago
  50. 6f1af02 xdiff: choose XDL_FAST_HASH code on sizeof(long) instead of __WORDSIZE by Thomas Rast · 13 years ago
  51. 86c340e Merge branch 'jc/diff-algo-cleanup' by Junio C Hamano · 13 years ago
  52. 6942efc xdiff: load full words in the inner loop of xdl_hash_record by Thomas Rast · 13 years ago
  53. 307ab20 xdiff: PATIENCE/HISTOGRAM are not independent option bits by Junio C Hamano · 13 years ago
  54. e5b0662 xdiff: remove XDL_PATCH_* macros by Junio C Hamano · 13 years ago
  55. 86e15ff Merge branch 'rs/diff-postimage-in-context' by Junio C Hamano · 13 years ago
  56. baf5aaa xdiff: print post-image for common records instead of pre-image by René Scharfe · 13 years ago
  57. 9b55aa0 Merge branch 'rs/diff-whole-function' by Junio C Hamano · 13 years ago
  58. 7a63a92 Merge branch 'rs/diff-cleanup-records-fix' by Junio C Hamano · 13 years ago
  59. 14937c2 diff: add option to show whole functions as context by René Scharfe · 13 years ago
  60. f99f4b3 xdiff: factor out get_func_line() by René Scharfe · 13 years ago
  61. c5aa906 Revert removal of multi-match discard heuristic in 27af01 by René Scharfe · 13 years ago
  62. b648557 Merge branch 'rc/histogram-diff' by Junio C Hamano · 14 years ago
  63. 2738bc3 xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env() by Tay Ray Chuan · 14 years ago
  64. b14b969 Merge branch 'rc/histogram-diff' into HEAD by Junio C Hamano · 14 years ago
  65. 27af01d xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records() by Tay Ray Chuan · 14 years ago
  66. 6486a84 xdiff/xhistogram: drop need for additional variable by Tay Ray Chuan · 14 years ago
  67. 43ca753 xdiff/xhistogram: rely on xdl_trim_ends() by Tay Ray Chuan · 14 years ago
  68. 19f7a9c xdiff/xhistogram: rework handling of recursed results by Tay Ray Chuan · 14 years ago
  69. 739864b xdiff: do away with xdl_mmfile_next() by Tay Ray Chuan · 14 years ago
  70. 86abba8 xdiff/xprepare: use a smaller sample size for histogram diff by Tay Ray Chuan · 14 years ago
  71. 9f37c27 xdiff/xprepare: skip classification by Tay Ray Chuan · 14 years ago
  72. 8c912ee teach --histogram to diff by Tay Ray Chuan · 14 years ago
  73. 1d26b25 xdiff/xpatience: factor out fall-back-diff function by Tay Ray Chuan · 14 years ago
  74. 159607a xdiff/xprepare: refactor abort cleanups by Tay Ray Chuan · 14 years ago
  75. 452f4fa xdiff/xprepare: use memset() by Tay Ray Chuan · 14 years ago
  76. 8cf666c Merge branch 'cb/diff-fname-optim' by Junio C Hamano · 14 years ago
  77. 349362c xdiff: cast arguments for ctype functions to unsigned char by Jonathan Nieder · 14 years ago
  78. c099789 diff: avoid repeated scanning while looking for funcname by René Scharfe · 14 years ago
  79. b4cf0f1 xdiff: optimise for no whitespace difference when ignoring whitespace. by Dylan Reid · 15 years ago
  80. c8c073c xdiff/xmerge.c: use memset() instead of explicit for-loop by Alexey Mahotkin · 15 years ago
  81. a4b5e91 xdl_merge(): move file1 and file2 labels to xmparam structure by Jonathan Nieder · 15 years ago
  82. 8a16143 xdl_merge(): add optional ancestor label to diff3-style output by Jonathan Nieder · 15 years ago
  83. 560119b refactor merge flags into xmparam_t by Bert Wesarg · 15 years ago
  84. cd1d61c make union merge an xdl merge favor by Bert Wesarg · 15 years ago
  85. 06dbc1e Merge branch 'jc/conflict-marker-size' by Junio C Hamano · 15 years ago
  86. 9914cf4 xdl_merge(): allow passing down marker_size in xmparam_t by Junio C Hamano · 15 years ago
  87. 00f8f97 xdl_merge(): introduce xmparam_t for merge specific parameters by Junio C Hamano · 15 years ago
  88. 73eb40e git-merge-file --ours, --theirs by Junio C Hamano · 17 years ago
  89. d34eca0 Merge branch 'tf/diff-whitespace-incomplete-line' by Junio C Hamano · 16 years ago
  90. 3b5ef0e xutils: Fix xdl_recmatch() on incomplete lines by Junio C Hamano · 16 years ago
  91. 78ed710 xutils: Fix hashing an incomplete line with whitespaces at the end by Junio C Hamano · 16 years ago
  92. f630cfd refactor: use bitsizeof() instead of 8 * sizeof() by Pierre Habouzit · 16 years ago
  93. 456cb4c Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint by Junio C Hamano · 16 years ago
  94. 5719db9 Change xdl_merge to generate output even for null merges by Charles Bailey · 16 years ago
  95. 3ea3c21 Fix typos / spelling in comments by Mike Ralphson · 16 years ago
  96. 8e24cba Fix various dead stores found by the clang static analyzer by Benjamin Kramer · 16 years ago
  97. 8c4c286 Merge branch 'kc/maint-diff-bwi-fix' into maint by Junio C Hamano · 16 years ago
  98. 5dc1308 Merge branch 'js/patience-diff' by Junio C Hamano · 16 years ago
  99. 9a01387 Merge branch 'kc/maint-diff-bwi-fix' by Junio C Hamano · 16 years ago
  100. 6d12ace Fix combined use of whitespace ignore options to diff by Keith Cascio · 16 years ago