Git 2.29

1. 7da656f Merge branch 'jk/diff-cc-oidfind-fix' by Junio C Hamano · 5 years ago
2. 957876f combine-diff: handle --find-object in multitree code path by Jeff King · 5 years ago
3. d01141d diff: get rid of redundant 'dense' argument by Sergey Organov · 5 years ago
4. fe299ec oid_array: rename source file from sha1-array by Jeff King · 6 years ago
5. 976ff7e combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo by brian m. carlson · 6 years ago
6. c425d36 Merge branch 'en/combined-all-paths' by Junio C Hamano · 7 years ago
7. d76ce4f log,diff-tree: add --combined-all-paths option by Elijah Newren · 7 years ago
8. 5d2710b Merge branch 'jk/diff-cc-stat-fixes' by Junio C Hamano · 7 years ago
9. dac03b5 combine-diff: treat --dirstat like --stat by Jeff King · 7 years ago
10. 04b19fc combine-diff: treat --summary like --stat by Jeff King · 7 years ago
11. 8290faa combine-diff: treat --shortstat like --stat by Jeff King · 7 years ago
12. 8817f0c combine-diff: factor out stat-format mask by Jeff King · 7 years ago
13. cde5554 Merge branch 'nd/the-index' by Junio C Hamano · 7 years ago
14. 39d23df Merge branch 'jk/xdiff-interface' by Junio C Hamano · 7 years ago
15. bd7ad45 notes-cache.c: remove the_repository references by Nguyễn Thái Ngọc Duy · 7 years ago
16. 0074c91 combine-diff: use an xdiff hunk callback by Jeff King · 7 years ago
17. 9346d6d xdiff-interface: provide a separate consume callback for hunks by Jeff King · 7 years ago
18. 11877b9 Merge branch 'nd/the-index' by Junio C Hamano · 7 years ago
19. acd00ea userdiff.c: remove implicit dependency on the_index by Nguyễn Thái Ngọc Duy · 7 years ago
20. 6afaf80 diff.c: remove the_index dependency in textconv() functions by Nguyễn Thái Ngọc Duy · 7 years ago
21. 0734f20 combine-diff.c: remove implicit dependency on the_index by Nguyễn Thái Ngọc Duy · 7 years ago
22. 4a7e27e convert "oidcmp() == 0" to oideq() by Jeff King · 7 years ago
23. cbd53a2 object-store: move object access functions to object-store.h by Stefan Beller · 8 years ago
24. b4f5aca sha1_file: convert read_sha1_file to struct object_id by brian m. carlson · 8 years ago
25. aab9583 Convert find_unique_abbrev* to struct object_id by brian m. carlson · 8 years ago
26. 169c9c0 Merge branch 'bw/c-plus-plus' by Junio C Hamano · 8 years ago
27. 06fffa0 combine-diff: rename 'new' variables by Brandon Williams · 8 years ago
28. 9bc89b1 Merge branch 'tb/crlf-conv-flags' by Junio C Hamano · 8 years ago
29. 8462ff4 convert_to_git(): safe_crlf/checksafe becomes int conv_flags by Torsten Bögershausen · 8 years ago
30. cf63051 diff: introduce DIFF_PICKAXE_KINDS_MASK by Stefan Beller · 8 years ago
31. 8cc6332 Merge branch 'bw/diff-opt-impl-to-bitfields' by Junio C Hamano · 8 years ago
32. 0d1e0e7 diff: make struct diff_flags members lowercase by Brandon Williams · 8 years ago
33. b2100e5 diff: remove DIFF_OPT_CLR macro by Brandon Williams · 8 years ago
34. 23dcf77 diff: remove DIFF_OPT_SET macro by Brandon Williams · 8 years ago
35. 3b69dae diff: remove DIFF_OPT_TST macro by Brandon Williams · 8 years ago
36. a98e610 refs: convert resolve_gitlink_ref to struct object_id by brian m. carlson · 8 years ago
37. 5812b3f Merge branch 'bw/ls-files-sans-the-index' by Junio C Hamano · 8 years ago
38. 82b474e convert: convert convert_to_git to take an index by Brandon Williams · 9 years ago
39. fda94b4 tree-diff: convert diff_tree_paths to struct object_id by Brandon Williams · 9 years ago
40. 66f414f diff-tree: convert diff_tree_sha1 to struct object_id by Brandon Williams · 9 years ago
41. 09fae19 combine-diff: convert find_paths_* to struct object_id by Brandon Williams · 9 years ago
42. b9acf54 combine-diff: convert diff_tree_combined to struct object_id by Brandon Williams · 9 years ago
43. f9704c2 diff: convert fill_filespec to struct object_id by Brandon Williams · 9 years ago
44. b1081e4 Merge branch 'bc/object-id' by Junio C Hamano · 9 years ago
45. 910650d Rename sha1_array to oid_array by brian m. carlson · 9 years ago
46. 98a72dd Make sha1_array_append take a struct object_id * by brian m. carlson · 9 years ago
47. 0dc3b03 combine-diff: replace malloc/snprintf with xstrfmt by Jeff King · 9 years ago
48. ee3051b sha1-array: convert internal storage for struct sha1_array to object_id by brian m. carlson · 9 years ago
49. d6cece5 diff_aligned_abbrev: use "struct oid" by Jeff King · 9 years ago
50. d5e3b01 diff_unique_abbrev: rename to diff_aligned_abbrev by Jeff King · 9 years ago
51. a63d31b Merge branch 'bc/cocci' by Junio C Hamano · 9 years ago
52. 41c9560 diff: rename struct diff_filespec's sha1_valid member by brian m. carlson · 9 years ago
53. a0d12c4 diff: convert struct diff_filespec to struct object_id by brian m. carlson · 9 years ago
54. ed6e803 pathspec: rename free_pathspec() to clear_pathspec() by Junio C Hamano · 10 years ago
55. 4b94ec9 combine-diff.c: use error_errno() by Nguyễn Thái Ngọc Duy · 10 years ago
56. 50a6c8e use st_add and st_mult for allocation size computation by Jeff King · 10 years ago
57. 96ffc06 convert trivial cases to FLEX_ARRAY macros by Jeff King · 10 years ago
58. 3733e69 use xmallocz to avoid size arithmetic by Jeff King · 10 years ago
59. b32fa95 convert trivial cases to ALLOC_ARRAY by Jeff King · 10 years ago
60. ed1c997 Remove get_object_hash. by brian m. carlson · 10 years ago
61. 7999b2c Add several uses of get_object_hash. by brian m. carlson · 10 years ago
62. 11a458b Sync with 2.4.10 by Junio C Hamano · 10 years ago
63. 6343e2f Sync with 2.3.10 by Junio C Hamano · 10 years ago
64. 3efb988 react to errors in xdi_diff by Jeff King · 10 years ago
65. db65170 Merge branch 'jk/color-diff-plain-is-context' by Junio C Hamano · 11 years ago
66. 8dbf3eb diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT by Jeff King · 11 years ago
67. 1ff57c1 diff: convert struct combine_diff_path to object_id by brian m. carlson · 11 years ago
68. 44ceb79 Merge branch 'jk/pretty-empty-format' by Junio C Hamano · 11 years ago
69. 4109c28 Merge branch 'jk/diff-tree-t-fix' by Junio C Hamano · 11 years ago
70. e09867f intersect_paths: respect mode in git's tree-sort by Jeff King · 11 years ago
71. b9c7d6e pretty: make empty userformats truly empty by Jeff King · 11 years ago
72. e7cc0ed Merge branch 'mk/show-s-no-extra-blank-line-for-merges' by Junio C Hamano · 12 years ago
73. ad2f725 git-show: fix 'git show -s' to not add extra terminator after merge commit by Max Kirillov · 12 years ago
74. 7195fbf combine-diff: speed it up, by using multiparent diff tree-walker directly by Kirill Smelkov · 12 years ago
75. eeb3f32 combine-diff: move changed-paths scanning logic into its own function by Kirill Smelkov · 12 years ago
76. 51af188 combine-diff: move show_log_first logic/action out of paths scanning by Kirill Smelkov · 12 years ago
77. 7b1004b combine-diff: simplify intersect_paths() further by Junio C Hamano · 12 years ago
78. af82c78 combine-diff: combine_diff_path.len is not needed anymore by Kirill Smelkov · 12 years ago
79. 8518ff8 combine-diff: optimize combine_diff_path sets intersection by Kirill Smelkov · 12 years ago
80. b02f5ae Merge branch 'jl/submodule-mv' by Junio C Hamano · 12 years ago
81. 4ab4a6d Merge branch 'tr/log-full-diff-keep-true-parents' by Junio C Hamano · 12 years ago
82. 53d00b3 log: use true parents for diff even when rewriting by Thomas Rast · 12 years ago
83. 98e023d many small typofixes by Ondřej Bílka · 12 years ago
84. bd1928d remove diff_tree_{setup,release}_paths by Nguyễn Thái Ngọc Duy · 12 years ago
85. a1ddd11 Merge branch 'cb/log-follow-with-combined' by Junio C Hamano · 13 years ago
86. edc7f0a Merge branch 'mk/combine-diff-context-horizon-fix' by Junio C Hamano · 13 years ago
87. 46ec510 fix segfault with git log -c --follow by Clemens Buchacher · 13 years ago
88. aac3857 combine-diff.c: Fix output when changes are exactly 3 lines apart by Matthijs Kooijman · 13 years ago
89. 99d3206 combine-diff: coalesce lost lines optimally by Antoine Pelisse · 13 years ago
90. fa04ae0 Allow combined diff to ignore white-spaces by Antoine Pelisse · 13 years ago
91. a1d68be Merge branch 'jk/diff-graph-cleanup' by Junio C Hamano · 13 years ago
92. 41ee2ad combine-diff.c: teach combined diffs about line prefix by John Keeping · 13 years ago
93. 7766705 combine-diff: lift 32-way limit of combined diff by Junio C Hamano · 13 years ago
94. 03adeea Merge branch 'jk/maint-null-in-trees' into maint-1.7.11 by Junio C Hamano · 13 years ago
95. 3b75314 Merge branch 'jk/maint-null-in-trees' by Junio C Hamano · 13 years ago
96. e545010 diff: do not use null sha1 as a sentinel value by Jeff King · 13 years ago
97. f84e8b6 Merge branch 'rs/combine-diff-zero-context-at-the-beginning' by Junio C Hamano · 14 years ago
98. e5e9b56 combine-diff: fix loop index underflow by René Scharfe · 14 years ago
99. 8288929 pass struct commit to diff_tree_combined_merge() by René Scharfe · 14 years ago
100. 0041f09 use struct sha1_array in diff_tree_combined() by René Scharfe · 14 years ago