Git 2.4.8

1. 6ea358f ll-merge.c: refactor `read_merge_config()` to use `git_config_string()` by Tanay Abhra · 11 years ago
2. d731f0a convert some config callbacks to parse_config_key by Jeff King · 13 years ago
3. e6d29a4 Merge branch 'jc/ll-merge-binary-ours' by Junio C Hamano · 13 years ago
4. e0e2065 ll-merge: warn about inability to merge binary files only when we can't by Junio C Hamano · 13 years ago
5. a944af1 merge: teach -Xours/-Xtheirs to binary ll-merge driver by Junio C Hamano · 13 years ago
6. 82247e9 remove superfluous newlines in error messages by Pete Wyckoff · 14 years ago
7. d932f4e Rename git_checkattr() to git_check_attr() by Michael Haggerty · 14 years ago
8. 4fb40c2 ll-merge: simplify opts == NULL case by Jonathan Nieder · 15 years ago
9. 58a1ece merge-recursive --patience by Justin Frankel · 15 years ago
10. 712516b ll-merge: replace flag argument with options struct by Jonathan Nieder · 15 years ago
11. 18b037a ll-merge: let caller decide whether to renormalize by Jonathan Nieder · 15 years ago
12. 73cf7f7 ll-merge: make flag easier to populate by Jonathan Nieder · 15 years ago
13. f217f0e Avoid conflicts when merging branches with mixed normalization by Eyvind Bernhardsen · 15 years ago
14. 66dbfd5 Rewrite dynamic structure initializations to runtime assignment by Gary V. Vaughan · 16 years ago
15. f01de62 ll_merge(): add ancestor label parameter for diff3-style output by Jonathan Nieder · 16 years ago
16. a4b5e91 xdl_merge(): move file1 and file2 labels to xmparam structure by Jonathan Nieder · 16 years ago
17. 560119b refactor merge flags into xmparam_t by Bert Wesarg · 16 years ago
18. cd1d61c make union merge an xdl merge favor by Bert Wesarg · 16 years ago
19. 06dbc1e Merge branch 'jc/conflict-marker-size' by Junio C Hamano · 16 years ago
20. fcb2a7e Merge branch 'ap/merge-backend-opts' by Junio C Hamano · 16 years ago
21. 8cc5b29 git merge -X<option> by Avery Pennarun · 16 years ago
22. 8588567 rerere: honor conflict-marker-size attribute by Junio C Hamano · 16 years ago
23. 23a64c9 conflict-marker-size: new attribute by Junio C Hamano · 16 years ago
24. 00f8f97 xdl_merge(): introduce xmparam_t for merge specific parameters by Junio C Hamano · 16 years ago
25. 7fb0eaa git_attr(): fix function signature by Junio C Hamano · 16 years ago
26. ac0ba18 run-command: convert simple callsites to use_shell by Jeff King · 16 years ago
27. 08ac696 Merge branch 'js/run-command-updates' by Junio C Hamano · 16 years ago
28. dd787c1 Merge branch 'tr/die_errno' by Junio C Hamano · 16 years ago
29. 5709e03 run_command: return exit code as positive value by Johannes Sixt · 16 years ago
30. 606475f Remove filename from conflict markers by Martin Renold · 16 years ago
31. 0721c31 Use die_errno() instead of die() when checking syscalls by Thomas Rast · 16 years ago
32. 09236d8 Merge branch 'sb/maint-1.6.0-add-config-fix' by Junio C Hamano · 16 years ago
33. 90dce51 use xstrdup, not strdup in ll-merge.c by Jim Meyering · 17 years ago
34. 0077138 Simplify some instances of run_command() by using run_command_v_opt(). by Johannes Sixt · 17 years ago
35. 691f1a2 replace direct calls to unlink(2) with unlink_or_warn by Alex Riesen · 17 years ago
36. ced621b merge-recursive: use strbuf_expand() instead of interpolate() by René Scharfe · 17 years ago
37. c236bcd git-merge-recursive: learn to honor merge.conflictstyle by Junio C Hamano · 17 years ago
38. ef90d6d Provide git_config with a callback-data parameter by Johannes Schindelin · 18 years ago
39. 525ab63 merge-recursive: split low-level merge functions out. by Junio C Hamano · 18 years ago