Git 2.35.7

1. 382b601 ll_union_merge(): rename path_unused parameter by Jeff King · 4 years, 6 months ago
2. 7f53f78 ll_union_merge(): pass name labels to ll_xdl_merge() by Jeff King · 4 years, 6 months ago
3. 7d879ad ll_binary_merge(): handle XDL_MERGE_FAVOR_UNION by Jeff King · 4 years, 6 months ago
4. ca56dad use CALLOC_ARRAY by René Scharfe · 4 years, 9 months ago
5. f5914f4 parse_config_key(): return subsection len as size_t by Jeff King · 6 years ago
6. 2c65d90 am: reload .gitattributes after patching it by brian m. carlson · 6 years ago
7. ac193e0 Merge branch 'en/merge-path-collision' by Junio C Hamano · 7 years ago
8. b2a7942 merge-recursive: increase marker length with depth of recursion by Elijah Newren · 7 years ago
9. 11877b9 Merge branch 'nd/the-index' by Junio C Hamano · 7 years ago
10. 32eaa46 ll-merge.c: remove implicit dependency on the_index by Nguyễn Thái Ngọc Duy · 7 years ago
11. d64324c Make git_check_attr() a void function by Torsten Bögershausen · 7 years ago
12. 7a400a2 attr: remove an implicit dependency on the_index by Nguyễn Thái Ngọc Duy · 7 years ago
13. 06f46f2 avoid "write_in_full(fd, buf, len) != len" pattern by Jeff King · 8 years ago
14. 50f03c6 Merge branch 'ab/free-and-null' by Junio C Hamano · 8 years ago
15. f31d23a Merge branch 'bw/config-h' by Junio C Hamano · 8 years ago
16. e140f7a coccinelle: make use of the "expression" FREE_AND_NULL() rule by Ævar Arnfjörð Bjarmason · 8 years ago
17. b2141fc config: don't include config.h by default by Brandon Williams · 8 years ago
18. a33e0b2 convert: convert renormalize_buffer to take an index by Brandon Williams · 9 years ago
19. 2aef63d attr: convert git_check_attrs() callers to use the new API by Junio C Hamano · 9 years ago
20. 7bd1805 attr: rename function and struct related to checking attributes by Junio C Hamano · 9 years ago
21. 243a7f0 Merge branch 'jc/ll-merge-internal' by Junio C Hamano · 10 years ago
22. d694a17 ll-merge: use a longer conflict marker for internal merge by Junio C Hamano · 10 years ago
23. ed34567 ll-merge: fix typo in comment by Junio C Hamano · 10 years ago
24. 3733e69 use xmallocz to avoid size arithmetic by Jeff King · 10 years ago
25. 7889179 Merge branch 'jk/war-on-sprintf' by Junio C Hamano · 10 years ago
26. 11a458b Sync with 2.4.10 by Junio C Hamano · 10 years ago
27. dcd1742 xdiff: reject files larger than ~1GB by Jeff King · 10 years ago
28. 5096d49 convert trivial sprintf / strcpy calls to xsnprintf by Jeff King · 10 years ago
29. ef45bb1 ll-merge: pass the original path to external drivers by Junio C Hamano · 11 years ago
30. 6ea358f ll-merge.c: refactor `read_merge_config()` to use `git_config_string()` by Tanay Abhra · 11 years ago
31. d731f0a convert some config callbacks to parse_config_key by Jeff King · 13 years ago
32. e6d29a4 Merge branch 'jc/ll-merge-binary-ours' by Junio C Hamano · 13 years ago
33. e0e2065 ll-merge: warn about inability to merge binary files only when we can't by Junio C Hamano · 13 years ago
34. a944af1 merge: teach -Xours/-Xtheirs to binary ll-merge driver by Junio C Hamano · 13 years ago
35. 82247e9 remove superfluous newlines in error messages by Pete Wyckoff · 14 years ago
36. d932f4e Rename git_checkattr() to git_check_attr() by Michael Haggerty · 14 years ago
37. 4fb40c2 ll-merge: simplify opts == NULL case by Jonathan Nieder · 15 years ago
38. 58a1ece merge-recursive --patience by Justin Frankel · 15 years ago
39. 712516b ll-merge: replace flag argument with options struct by Jonathan Nieder · 15 years ago
40. 18b037a ll-merge: let caller decide whether to renormalize by Jonathan Nieder · 15 years ago
41. 73cf7f7 ll-merge: make flag easier to populate by Jonathan Nieder · 15 years ago
42. f217f0e Avoid conflicts when merging branches with mixed normalization by Eyvind Bernhardsen · 15 years ago
43. 66dbfd5 Rewrite dynamic structure initializations to runtime assignment by Gary V. Vaughan · 16 years ago
44. f01de62 ll_merge(): add ancestor label parameter for diff3-style output by Jonathan Nieder · 16 years ago
45. a4b5e91 xdl_merge(): move file1 and file2 labels to xmparam structure by Jonathan Nieder · 16 years ago
46. 560119b refactor merge flags into xmparam_t by Bert Wesarg · 16 years ago
47. cd1d61c make union merge an xdl merge favor by Bert Wesarg · 16 years ago
48. 06dbc1e Merge branch 'jc/conflict-marker-size' by Junio C Hamano · 16 years ago
49. fcb2a7e Merge branch 'ap/merge-backend-opts' by Junio C Hamano · 16 years ago
50. 8cc5b29 git merge -X<option> by Avery Pennarun · 16 years ago
51. 8588567 rerere: honor conflict-marker-size attribute by Junio C Hamano · 16 years ago
52. 23a64c9 conflict-marker-size: new attribute by Junio C Hamano · 16 years ago
53. 00f8f97 xdl_merge(): introduce xmparam_t for merge specific parameters by Junio C Hamano · 16 years ago
54. 7fb0eaa git_attr(): fix function signature by Junio C Hamano · 16 years ago
55. ac0ba18 run-command: convert simple callsites to use_shell by Jeff King · 16 years ago
56. 08ac696 Merge branch 'js/run-command-updates' by Junio C Hamano · 16 years ago
57. dd787c1 Merge branch 'tr/die_errno' by Junio C Hamano · 16 years ago
58. 5709e03 run_command: return exit code as positive value by Johannes Sixt · 16 years ago
59. 606475f Remove filename from conflict markers by Martin Renold · 16 years ago
60. 0721c31 Use die_errno() instead of die() when checking syscalls by Thomas Rast · 16 years ago
61. 09236d8 Merge branch 'sb/maint-1.6.0-add-config-fix' by Junio C Hamano · 16 years ago
62. 90dce51 use xstrdup, not strdup in ll-merge.c by Jim Meyering · 17 years ago
63. 0077138 Simplify some instances of run_command() by using run_command_v_opt(). by Johannes Sixt · 17 years ago
64. 691f1a2 replace direct calls to unlink(2) with unlink_or_warn by Alex Riesen · 17 years ago
65. ced621b merge-recursive: use strbuf_expand() instead of interpolate() by René Scharfe · 17 years ago
66. c236bcd git-merge-recursive: learn to honor merge.conflictstyle by Junio C Hamano · 17 years ago
67. ef90d6d Provide git_config with a callback-data parameter by Johannes Schindelin · 18 years ago
68. 525ab63 merge-recursive: split low-level merge functions out. by Junio C Hamano · 18 years ago