Google Git
Sign in
googlers / jrn / git / da27a6fbd50861149b32cfd1f9e5c36a935c575a / combine-diff.c
  1. 9bc89b1 Merge branch 'tb/crlf-conv-flags' by Junio C Hamano · 7 years ago
  2. 8462ff4 convert_to_git(): safe_crlf/checksafe becomes int conv_flags by Torsten Bögershausen · 7 years ago
  3. cf63051 diff: introduce DIFF_PICKAXE_KINDS_MASK by Stefan Beller · 7 years ago
  4. 8cc6332 Merge branch 'bw/diff-opt-impl-to-bitfields' by Junio C Hamano · 7 years ago
  5. 0d1e0e7 diff: make struct diff_flags members lowercase by Brandon Williams · 7 years ago
  6. b2100e5 diff: remove DIFF_OPT_CLR macro by Brandon Williams · 7 years ago
  7. 23dcf77 diff: remove DIFF_OPT_SET macro by Brandon Williams · 7 years ago
  8. 3b69dae diff: remove DIFF_OPT_TST macro by Brandon Williams · 7 years ago
  9. a98e610 refs: convert resolve_gitlink_ref to struct object_id by brian m. carlson · 7 years ago
  10. 5812b3f Merge branch 'bw/ls-files-sans-the-index' by Junio C Hamano · 8 years ago
  11. 82b474e convert: convert convert_to_git to take an index by Brandon Williams · 8 years ago
  12. fda94b4 tree-diff: convert diff_tree_paths to struct object_id by Brandon Williams · 8 years ago
  13. 66f414f diff-tree: convert diff_tree_sha1 to struct object_id by Brandon Williams · 8 years ago
  14. 09fae19 combine-diff: convert find_paths_* to struct object_id by Brandon Williams · 8 years ago
  15. b9acf54 combine-diff: convert diff_tree_combined to struct object_id by Brandon Williams · 8 years ago
  16. f9704c2 diff: convert fill_filespec to struct object_id by Brandon Williams · 8 years ago
  17. b1081e4 Merge branch 'bc/object-id' by Junio C Hamano · 8 years ago
  18. 910650d Rename sha1_array to oid_array by brian m. carlson · 8 years ago
  19. 98a72dd Make sha1_array_append take a struct object_id * by brian m. carlson · 8 years ago
  20. 0dc3b03 combine-diff: replace malloc/snprintf with xstrfmt by Jeff King · 8 years ago
  21. ee3051b sha1-array: convert internal storage for struct sha1_array to object_id by brian m. carlson · 8 years ago
  22. d6cece5 diff_aligned_abbrev: use "struct oid" by Jeff King · 8 years ago
  23. d5e3b01 diff_unique_abbrev: rename to diff_aligned_abbrev by Jeff King · 8 years ago
  24. a63d31b Merge branch 'bc/cocci' by Junio C Hamano · 9 years ago
  25. 41c9560 diff: rename struct diff_filespec's sha1_valid member by brian m. carlson · 9 years ago
  26. a0d12c4 diff: convert struct diff_filespec to struct object_id by brian m. carlson · 9 years ago
  27. ed6e803 pathspec: rename free_pathspec() to clear_pathspec() by Junio C Hamano · 9 years ago
  28. 4b94ec9 combine-diff.c: use error_errno() by Nguyễn Thái Ngọc Duy · 9 years ago
  29. 50a6c8e use st_add and st_mult for allocation size computation by Jeff King · 9 years ago
  30. 96ffc06 convert trivial cases to FLEX_ARRAY macros by Jeff King · 9 years ago
  31. 3733e69 use xmallocz to avoid size arithmetic by Jeff King · 9 years ago
  32. b32fa95 convert trivial cases to ALLOC_ARRAY by Jeff King · 9 years ago
  33. ed1c997 Remove get_object_hash. by brian m. carlson · 9 years ago
  34. 7999b2c Add several uses of get_object_hash. by brian m. carlson · 9 years ago
  35. 11a458b Sync with 2.4.10 by Junio C Hamano · 9 years ago
  36. 6343e2f Sync with 2.3.10 by Junio C Hamano · 9 years ago
  37. 3efb988 react to errors in xdi_diff by Jeff King · 9 years ago
  38. db65170 Merge branch 'jk/color-diff-plain-is-context' by Junio C Hamano · 10 years ago
  39. 8dbf3eb diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT by Jeff King · 10 years ago
  40. 1ff57c1 diff: convert struct combine_diff_path to object_id by brian m. carlson · 10 years ago
  41. 44ceb79 Merge branch 'jk/pretty-empty-format' by Junio C Hamano · 11 years ago
  42. 4109c28 Merge branch 'jk/diff-tree-t-fix' by Junio C Hamano · 11 years ago
  43. e09867f intersect_paths: respect mode in git's tree-sort by Jeff King · 11 years ago
  44. b9c7d6e pretty: make empty userformats truly empty by Jeff King · 11 years ago
  45. e7cc0ed Merge branch 'mk/show-s-no-extra-blank-line-for-merges' by Junio C Hamano · 11 years ago
  46. ad2f725 git-show: fix 'git show -s' to not add extra terminator after merge commit by Max Kirillov · 11 years ago
  47. 7195fbf combine-diff: speed it up, by using multiparent diff tree-walker directly by Kirill Smelkov · 11 years ago
  48. eeb3f32 combine-diff: move changed-paths scanning logic into its own function by Kirill Smelkov · 11 years ago
  49. 51af188 combine-diff: move show_log_first logic/action out of paths scanning by Kirill Smelkov · 11 years ago
  50. 7b1004b combine-diff: simplify intersect_paths() further by Junio C Hamano · 11 years ago
  51. af82c78 combine-diff: combine_diff_path.len is not needed anymore by Kirill Smelkov · 11 years ago
  52. 8518ff8 combine-diff: optimize combine_diff_path sets intersection by Kirill Smelkov · 11 years ago
  53. b02f5ae Merge branch 'jl/submodule-mv' by Junio C Hamano · 12 years ago
  54. 4ab4a6d Merge branch 'tr/log-full-diff-keep-true-parents' by Junio C Hamano · 12 years ago
  55. 53d00b3 log: use true parents for diff even when rewriting by Thomas Rast · 12 years ago
  56. 98e023d many small typofixes by Ondřej Bílka · 12 years ago
  57. bd1928d remove diff_tree_{setup,release}_paths by Nguyễn Thái Ngọc Duy · 12 years ago
  58. a1ddd11 Merge branch 'cb/log-follow-with-combined' by Junio C Hamano · 12 years ago
  59. edc7f0a Merge branch 'mk/combine-diff-context-horizon-fix' by Junio C Hamano · 12 years ago
  60. 46ec510 fix segfault with git log -c --follow by Clemens Buchacher · 12 years ago
  61. aac3857 combine-diff.c: Fix output when changes are exactly 3 lines apart by Matthijs Kooijman · 12 years ago
  62. 99d3206 combine-diff: coalesce lost lines optimally by Antoine Pelisse · 12 years ago
  63. fa04ae0 Allow combined diff to ignore white-spaces by Antoine Pelisse · 12 years ago
  64. a1d68be Merge branch 'jk/diff-graph-cleanup' by Junio C Hamano · 12 years ago
  65. 41ee2ad combine-diff.c: teach combined diffs about line prefix by John Keeping · 12 years ago
  66. 7766705 combine-diff: lift 32-way limit of combined diff by Junio C Hamano · 12 years ago
  67. 03adeea Merge branch 'jk/maint-null-in-trees' into maint-1.7.11 by Junio C Hamano · 13 years ago
  68. 3b75314 Merge branch 'jk/maint-null-in-trees' by Junio C Hamano · 13 years ago
  69. e545010 diff: do not use null sha1 as a sentinel value by Jeff King · 13 years ago
  70. f84e8b6 Merge branch 'rs/combine-diff-zero-context-at-the-beginning' by Junio C Hamano · 13 years ago
  71. e5e9b56 combine-diff: fix loop index underflow by René Scharfe · 13 years ago
  72. 8288929 pass struct commit to diff_tree_combined_merge() by René Scharfe · 13 years ago
  73. 0041f09 use struct sha1_array in diff_tree_combined() by René Scharfe · 13 years ago
  74. f946b46 Merge branch 'jk/color-and-pager' by Junio C Hamano · 14 years ago
  75. e78f829 Merge branch 'jc/combine-diff-callback' by Junio C Hamano · 14 years ago
  76. 25e5e2b combine-diff: support format_callback by Junio C Hamano · 14 years ago
  77. f1c9626 diff: refactor COLOR_DIFF from a flag into an int by Jeff King · 14 years ago
  78. 660578d Merge branch 'jc/maint-combined-diff-work-tree' by Junio C Hamano · 14 years ago
  79. 9969454 diff -c/--cc: do not mistake "resolved as deletion" as "use working tree" by Junio C Hamano · 14 years ago
  80. 0508fe5 combine-diff: respect textconv attributes by Jeff King · 14 years ago
  81. 4d5f347 combine-diff: handle binary files as binary by Jeff King · 14 years ago
  82. c95b99b combine-diff: calculate mode_differs earlier by Jeff King · 14 years ago
  83. 7c978a0 combine-diff: split header printing into its own function by Jeff King · 14 years ago
  84. 6033553 Merge branch 'rs/diff-no-minimal' into maint by Junio C Hamano · 15 years ago
  85. 39b5977 Merge branch 'rs/diff-no-minimal' by Junio C Hamano · 15 years ago
  86. dfea790 remove ecb parameter from xdi_diff_outf() by René Scharfe · 15 years ago
  87. 582aa00 git diff too slow for a file by René Scharfe · 15 years ago
  88. 2179870 combined diff: correctly handle truncated file by Thomas Rast · 15 years ago
  89. 89cb73a Give the hunk comment its own color by Bert Wesarg · 15 years ago
  90. 248b6c0 Merge branch 'maint' by Junio C Hamano · 16 years ago
  91. b810cbb diff --cc: a lost line at the beginning of the file is shown incorrectly by Junio C Hamano · 16 years ago
  92. 55d5d5b combine-diff.c: fix performance problem when folding common deleted lines by Junio C Hamano · 16 years ago
  93. 0721c31 Use die_errno() instead of die() when checking syscalls by Thomas Rast · 16 years ago
  94. 4b25d09 Fix a bunch of pointer declarations (codestyle) by Felipe Contreras · 16 years ago
  95. d1c8c0c Merge branch 'maint' by Junio C Hamano · 16 years ago
  96. 9347473 Merge branch 'maint-1.6.0' into maint-1.6.1 by Junio C Hamano · 16 years ago
  97. 7dae8b2 diff -c -p: do not die on submodules by Junio C Hamano · 16 years ago
  98. a9bfe81 Merge branch 'kb/checkout-optim' by Junio C Hamano · 16 years ago
  99. fd13b21 Move local variables to narrower scopes by Benjamin Kramer · 16 years ago
  100. 91fcbcb show_patch_diff(): remove a call to fstat() by Kjetil Barvik · 16 years ago