Git 2.4

1. 44ceb79 Merge branch 'jk/pretty-empty-format' by Junio C Hamano · 11 years ago
2. 4109c28 Merge branch 'jk/diff-tree-t-fix' by Junio C Hamano · 11 years ago
3. e09867f intersect_paths: respect mode in git's tree-sort by Jeff King · 11 years ago
4. b9c7d6e pretty: make empty userformats truly empty by Jeff King · 11 years ago
5. e7cc0ed Merge branch 'mk/show-s-no-extra-blank-line-for-merges' by Junio C Hamano · 12 years ago
6. ad2f725 git-show: fix 'git show -s' to not add extra terminator after merge commit by Max Kirillov · 12 years ago
7. 7195fbf combine-diff: speed it up, by using multiparent diff tree-walker directly by Kirill Smelkov · 12 years ago
8. eeb3f32 combine-diff: move changed-paths scanning logic into its own function by Kirill Smelkov · 12 years ago
9. 51af188 combine-diff: move show_log_first logic/action out of paths scanning by Kirill Smelkov · 12 years ago
10. 7b1004b combine-diff: simplify intersect_paths() further by Junio C Hamano · 12 years ago
11. af82c78 combine-diff: combine_diff_path.len is not needed anymore by Kirill Smelkov · 12 years ago
12. 8518ff8 combine-diff: optimize combine_diff_path sets intersection by Kirill Smelkov · 12 years ago
13. b02f5ae Merge branch 'jl/submodule-mv' by Junio C Hamano · 12 years ago
14. 4ab4a6d Merge branch 'tr/log-full-diff-keep-true-parents' by Junio C Hamano · 12 years ago
15. 53d00b3 log: use true parents for diff even when rewriting by Thomas Rast · 12 years ago
16. 98e023d many small typofixes by Ondřej Bílka · 12 years ago
17. bd1928d remove diff_tree_{setup,release}_paths by Nguyễn Thái Ngọc Duy · 12 years ago
18. a1ddd11 Merge branch 'cb/log-follow-with-combined' by Junio C Hamano · 13 years ago
19. edc7f0a Merge branch 'mk/combine-diff-context-horizon-fix' by Junio C Hamano · 13 years ago
20. 46ec510 fix segfault with git log -c --follow by Clemens Buchacher · 13 years ago
21. aac3857 combine-diff.c: Fix output when changes are exactly 3 lines apart by Matthijs Kooijman · 13 years ago
22. 99d3206 combine-diff: coalesce lost lines optimally by Antoine Pelisse · 13 years ago
23. fa04ae0 Allow combined diff to ignore white-spaces by Antoine Pelisse · 13 years ago
24. a1d68be Merge branch 'jk/diff-graph-cleanup' by Junio C Hamano · 13 years ago
25. 41ee2ad combine-diff.c: teach combined diffs about line prefix by John Keeping · 13 years ago
26. 7766705 combine-diff: lift 32-way limit of combined diff by Junio C Hamano · 13 years ago
27. 03adeea Merge branch 'jk/maint-null-in-trees' into maint-1.7.11 by Junio C Hamano · 13 years ago
28. 3b75314 Merge branch 'jk/maint-null-in-trees' by Junio C Hamano · 13 years ago
29. e545010 diff: do not use null sha1 as a sentinel value by Jeff King · 13 years ago
30. f84e8b6 Merge branch 'rs/combine-diff-zero-context-at-the-beginning' by Junio C Hamano · 14 years ago
31. e5e9b56 combine-diff: fix loop index underflow by René Scharfe · 14 years ago
32. 8288929 pass struct commit to diff_tree_combined_merge() by René Scharfe · 14 years ago
33. 0041f09 use struct sha1_array in diff_tree_combined() by René Scharfe · 14 years ago
34. f946b46 Merge branch 'jk/color-and-pager' by Junio C Hamano · 14 years ago
35. e78f829 Merge branch 'jc/combine-diff-callback' by Junio C Hamano · 14 years ago
36. 25e5e2b combine-diff: support format_callback by Junio C Hamano · 14 years ago
37. f1c9626 diff: refactor COLOR_DIFF from a flag into an int by Jeff King · 14 years ago
38. 660578d Merge branch 'jc/maint-combined-diff-work-tree' by Junio C Hamano · 14 years ago
39. 9969454 diff -c/--cc: do not mistake "resolved as deletion" as "use working tree" by Junio C Hamano · 14 years ago
40. 0508fe5 combine-diff: respect textconv attributes by Jeff King · 15 years ago
41. 4d5f347 combine-diff: handle binary files as binary by Jeff King · 15 years ago
42. c95b99b combine-diff: calculate mode_differs earlier by Jeff King · 15 years ago
43. 7c978a0 combine-diff: split header printing into its own function by Jeff King · 15 years ago
44. 6033553 Merge branch 'rs/diff-no-minimal' into maint by Junio C Hamano · 16 years ago
45. 39b5977 Merge branch 'rs/diff-no-minimal' by Junio C Hamano · 16 years ago
46. dfea790 remove ecb parameter from xdi_diff_outf() by René Scharfe · 16 years ago
47. 582aa00 git diff too slow for a file by René Scharfe · 16 years ago
48. 2179870 combined diff: correctly handle truncated file by Thomas Rast · 16 years ago
49. 89cb73a Give the hunk comment its own color by Bert Wesarg · 16 years ago
50. 248b6c0 Merge branch 'maint' by Junio C Hamano · 16 years ago
51. b810cbb diff --cc: a lost line at the beginning of the file is shown incorrectly by Junio C Hamano · 16 years ago
52. 55d5d5b combine-diff.c: fix performance problem when folding common deleted lines by Junio C Hamano · 16 years ago
53. 0721c31 Use die_errno() instead of die() when checking syscalls by Thomas Rast · 16 years ago
54. 4b25d09 Fix a bunch of pointer declarations (codestyle) by Felipe Contreras · 17 years ago
55. d1c8c0c Merge branch 'maint' by Junio C Hamano · 17 years ago
56. 9347473 Merge branch 'maint-1.6.0' into maint-1.6.1 by Junio C Hamano · 17 years ago
57. 7dae8b2 diff -c -p: do not die on submodules by Junio C Hamano · 17 years ago
58. a9bfe81 Merge branch 'kb/checkout-optim' by Junio C Hamano · 17 years ago
59. fd13b21 Move local variables to narrower scopes by Benjamin Kramer · 17 years ago
60. 91fcbcb show_patch_diff(): remove a call to fstat() by Kjetil Barvik · 17 years ago
61. 912342d combine-diff.c: use strbuf_readlink() by Junio C Hamano · 17 years ago
62. 9ccd0a8 Always initialize xpparam_t to 0 by Brian Downing · 17 years ago
63. f285a2d Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer by Brandon Casey · 17 years ago
64. e69a6f4 Merge branch 'jc/diff-prefix' by Junio C Hamano · 17 years ago
65. fdfb4cf Merge branch 'jc/hide-cr-in-diff-from-less' by Junio C Hamano · 17 years ago
66. a5a818e diff: vary default prefix depending on what are compared by Junio C Hamano · 17 years ago
67. 3928097 diff: Help "less" hide ^M from the output by Junio C Hamano · 17 years ago
68. 49d3536 Merge branch 'maint' to sync with 1.6.0.1 by Junio C Hamano · 17 years ago
69. 5e568f9 Respect core.autocrlf in combined diff by Alexander Gavrilov · 17 years ago
70. 8a3f524 xdiff-interface: hide the whole "xdiff_emit_state" business from the caller by Junio C Hamano · 17 years ago
71. c99db9d2 Make xdi_diff_outf interface for running xdiff_outf diffs by Brian Downing · 17 years ago
72. bc9c3e0 Merge branch 'jc/maint-combine-diff-pre-context' by Junio C Hamano · 18 years ago
73. c86fbe5 diff -c/--cc: do not include uninteresting deletion before leading context by Junio C Hamano · 18 years ago
74. c697ad1 Cleanup xread() loops to use read_in_full() by Heikki Orsila · 18 years ago
75. 0286565 Remove dead code: show_log() sep argument and diff_options.msg_sep by Adam Simpkins · 18 years ago
76. f0ec47b Die for an early EOF in a file reading loop by Heikki Orsila · 18 years ago
77. d562509 Fix rewrite_diff() name quoting. by Junio C Hamano · 18 years ago
78. 462a15b combine-diff: Fix path quoting by Junio C Hamano · 18 years ago
79. c279d7e xdl_diff: identify call sites. by Junio C Hamano · 18 years ago
80. 8f67f8a Make the diff_options bitfields be an unsigned with explicit masks. by Pierre Habouzit · 18 years ago
81. 663af34 Full rework of quote_c_style and write_name_quoted. by Pierre Habouzit · 18 years ago
82. 30b2501 Future-proof source for changes in xdemitconf_t by Johannes Schindelin · 18 years ago
83. 8a912bc Ensure return value from xread() is always stored into an ssize_t by Johan Herland · 19 years ago
84. f1af60b Support 'diff=pgm' attribute by Junio C Hamano · 19 years ago
85. dc49cd7 Cast 64 bit off_t to 32 bit size_t by Shawn O. Pearce · 19 years ago
86. a249a9b Tell multi-parent diff about core.symlinks. by Johannes Sixt · 19 years ago
87. 21666f1 convert object type handling from a string to a number by Nicolas Pitre · 19 years ago
88. ee24ee5 diff --cc: integer overflow given a 2GB-or-larger file by Jim Meyering · 19 years ago
89. 4fc970c diff --cc: fix display of symlink conflicts during a merge. by Junio C Hamano · 19 years ago
90. 3b0f5e8 combine-diff: special case --unified=0 by Junio C Hamano · 19 years ago
91. af70fa4 Merge branch 'jc/combined' by Junio C Hamano · 19 years ago
92. 4415278 combine-diff: honour --no-commit-id by Junio C Hamano · 19 years ago
93. 7a8ac59 combine-diff: fix hunk_comment_line logic. by Junio C Hamano · 19 years ago
94. e893f7a Merge branch 'jc/combined' by Junio C Hamano · 19 years ago
95. d5f6a01 combine-diff: a few more finishing touches. by Junio C Hamano · 19 years ago
96. 74e2abe diff --numstat by Junio C Hamano · 19 years ago
97. e702496 Convert memcpy(a,b,20) to hashcpy(a,b). by Shawn Pearce · 19 years ago
98. a89fccd Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length. by David Rientjes · 19 years ago
99. 0bef57e make inline is_null_sha1 global by David Rientjes · 19 years ago
100. a976b0a Remove combine-diff.c::uninteresting() by Junio C Hamano · 19 years ago