Git 2.2.0-rc0

1. b946576 Merge branch 'jn/parse-config-slot' by Junio C Hamano · 11 years ago
2. f6c5a29 color_parse: do not mention variable name in error message by Jeff King · 11 years ago
3. bedd3b4 Merge branch 'nd/large-blobs' by Junio C Hamano · 11 years ago
4. d318027 run-command: introduce CHILD_PROCESS_INIT by René Scharfe · 11 years ago
5. 1aaf69e diff: shortcut for diff'ing two binary SHA-1 objects by Nguyễn Thái Ngọc Duy · 11 years ago
6. 6bf3b81 diff --stat: mark any file larger than core.bigfilethreshold binary by Nguyễn Thái Ngọc Duy · 11 years ago
7. 8e5dd3d diff.c: allow to pass more flags to diff_populate_filespec by Nguyễn Thái Ngọc Duy �� 11 years ago
8. cedc61a strbuf: use strbuf_addstr() for adding C strings by René Scharfe · 11 years ago
9. 0539cc0 stat_opt: check extra strlen call by Jeff King · 11 years ago
10. 95b567c use skip_prefix to avoid repeating strings by Jeff King · 11 years ago
11. ae021d8 use skip_prefix to avoid magic numbers by Jeff King · 11 years ago
12. 9e1a5eb parse_diff_color_slot: drop ofs parameter by Jeff King · 11 years ago
13. a634a6d Merge branch 'bg/xcalloc-nmemb-then-size' by Junio C Hamano · 11 years ago
14. b0e2c99 Merge branch 'jk/diff-follow-must-take-one-pathspec' by Junio C Hamano · 11 years ago
15. 6779e43 Merge branch 'jk/external-diff-use-argv-array' by Junio C Hamano · 12 years ago
16. 8eaf517 Merge branch 'ks/tree-diff-nway' by Junio C Hamano · 12 years ago
17. 1a4927c diff.c: rearrange xcalloc arguments by Brian Gesiak · 12 years ago
18. dd63f16 move "--follow needs one pathspec" rule to diff_setup_done by Jeff King · 12 years ago
19. 5f11a7a Merge branch 'jk/external-diff-use-argv-array' (early part) by Junio C Hamano · 12 years ago
20. f3efe78 run_external_diff: refactor cmdline setup logic by Jeff King · 12 years ago
21. 0d4217d run_external_diff: hoist common bits out of conditional by Jeff King · 12 years ago
22. 5b88caa run_external_diff: drop fflush(NULL) by Jeff King · 12 years ago
23. 89294d1 run_external_diff: clean up error handling by Jeff King · 12 years ago
24. ae049c9 run_external_diff: use an argv_array for the environment by Jeff King · 12 years ago
25. 82fbf26 run_external_diff: use an argv_array for the command line by Jeff King · 12 years ago
26. d1d96a8 i18n: remove obsolete comments for translators in diffstat generation by Jiang Xin · 12 years ago
27. d59c12d Merge branch 'jl/nor-or-nand-and' by Junio C Hamano · 12 years ago
28. 7195fbf combine-diff: speed it up, by using multiparent diff tree-walker directly by Kirill Smelkov · 12 years ago
29. 72441af tree-diff: rework diff_tree() to generate diffs for multiparent cases as well by Kirill Smelkov · 12 years ago
30. 0168990 comments: fix misuses of "nor" by Justin Lebar · 12 years ago
31. a5aca6e Merge branch 'tr/diff-submodule-no-reuse-worktree' into maint by Junio C Hamano · 12 years ago
32. 34120a5 Merge branch 'nd/diff-quiet-stat-dirty' into maint by Junio C Hamano · 12 years ago
33. 6f75e48 Merge branch 'rm/strchrnul-not-strlen' by Junio C Hamano · 12 years ago
34. fe9122a Merge branch 'dd/use-alloc-grow' by Junio C Hamano · 12 years ago
35. 481e6aa Merge branch 'tr/diff-submodule-no-reuse-worktree' by Junio C Hamano · 12 years ago
36. 2c5495f use strchrnul() in place of strchr() and strlen() by Rohit Mani · 12 years ago
37. 2687ffd Merge branch 'jc/hold-diff-remove-q-synonym-for-no-deletion' by Junio C Hamano · 12 years ago
38. 4c960a4 diff.c: use ALLOC_GROW() by Dmitry S. Dolzhenko · 12 years ago
39. 1e74545 Merge branch 'nd/diff-quiet-stat-dirty' by Junio C Hamano · 12 years ago
40. f34b205 diff: do not quit early on stat-dirty files by Nguyễn Thái Ngọc Duy · 12 years ago
41. fceb907 diff.c: move diffcore_skip_stat_unmatch core logic out for reuse later by Nguyễn Thái Ngọc Duy · 12 years ago
42. aba4727 diff: do not reuse_worktree_file for submodules by Thomas Rast · 12 years ago
43. e049109 Merge branch 'jk/diff-filespec-cleanup' by Junio C Hamano · 12 years ago
44. 428d52a diff_filespec: drop xfrm_flags field by Jeff King · 12 years ago
45. 2da5cbd Merge branch 'sb/diff-orderfile-config' by Junio C Hamano · 12 years ago
46. 6904f9a Merge branch 'zk/difftool-counts' by Junio C Hamano · 12 years ago
47. 6d8940b diff: add diff.orderfile configuration variable by Samuel Bronson · 12 years ago
48. ad70448 Merge branch 'cc/starts-n-ends-with' by Junio C Hamano · 12 years ago
49. 0ea7d5b diff.c: fix some recent whitespace style violations by Jeff King · 12 years ago
50. ee7fb0b difftool: display the number of files in the diff queue in the prompt by Zoltan Klinger · 12 years ago
51. 5955654 replace {pre,suf}fixcmp() with {starts,ends}_with() by Christian Couder · 12 years ago
52. b0d12fc Use the word 'stuck' instead of 'sticked' by Nicolas Vigier · 12 years ago
53. 4197361 Merge branch 'mg/more-textconv' by Junio C Hamano · 12 years ago
54. 01a2a03 Merge branch 'jc/diff-filter-negation' by Junio C Hamano · 12 years ago
55. 3b0c18a diff: fix a possible null pointer dereference by Stefan Beller · 12 years ago
56. c189c4f diff: remove ternary operator evaluating always to true by Stefan Beller · 12 years ago
57. 0def712 Merge branch 'ob/typofixes' by Junio C Hamano · 12 years ago
58. 0c544a2 Merge branch 'sb/misc-fixes' by Junio C Hamano · 12 years ago
59. 749f763 typofix: in-code comments by Ondřej Bílka · 12 years ago
60. d3aeb31 Merge branch 'nd/const-struct-cache-entry' by Junio C Hamano · 12 years ago
61. e2ecd25 Merge branch 'mm/diff-no-patch-synonym-to-s' by Junio C Hamano · 12 years ago
62. c48f681 diff: remove "diff-files -q" in a version of Git in a distant future by Junio C Hamano · 12 years ago
63. 95a7c54 diff: deprecate -q option to diff-files by Junio C Hamano · 12 years ago
64. 71482d3 diff: allow --patch & cie to override -s/--no-patch by Matthieu Moy · 12 years ago
65. d09cd15 diff: allow --no-patch as synonym for -s by Matthieu Moy · 12 years ago
66. 7f2ea5f diff: allow lowercase letter to specify what change class to exclude by Junio C Hamano · 12 years ago
67. bf142ec diff: reject unknown change class given to --diff-filter by Junio C Hamano · 12 years ago
68. 1ecc1cb diff: preparse --diff-filter string argument by Junio C Hamano · 12 years ago
69. 08578fa diff: factor out match_filter() by Junio C Hamano · 12 years ago
70. 949226f diff: pass the whole diff_options to diffcore_apply_filter() by Junio C Hamano · 12 years ago
71. d3c9cf3 diff.c: Do not initialize a variable, which gets reassigned anyway. by Stefan Beller · 12 years ago
72. 77f3c3f Merge branch 'jc/maint-diff-core-safecrlf' by Junio C Hamano · 12 years ago
73. 9c5e6c8 Convert "struct cache_entry *" to "const ..." wherever possible by Nguyễn Thái Ngọc Duy · 12 years ago
74. 5430bb2 diff: demote core.safecrlf=true to core.safecrlf=warn by Junio C Hamano · 12 years ago
75. 36617af diff: add --ignore-blank-lines option by Antoine Pelisse · 12 years ago
76. 6c37400 diff_opt: track whether flags have been set explicitly by Junio C Hamano · 13 years ago
77. e4d1595 Merge branch 'jk/diff-algo-finishing-touches' into maint by Junio C Hamano · 13 years ago
78. f678d9b Merge branch 'jk/diff-graph-submodule-summary' by Junio C Hamano · 13 years ago
79. 825ccfc Merge branch 'jk/diff-algo-finishing-touches' by Junio C Hamano · 13 years ago
80. 41ccfdd Correct common spelling mistakes in comments and tests by Stefano Lattarini · 13 years ago
81. 0f33a06 submodule: print graph output next to submodule log by John Keeping · 13 years ago
82. 0895c6d diff: allow unstuck arguments with --diff-algorithm by John Keeping · 13 years ago
83. b76a9e1 Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint by Junio C Hamano · 13 years ago
84. caf217a Merge branch 'ap/maint-diff-rename-avoid-overlap' by Junio C Hamano · 13 years ago
85. c9fc441 diff.c: diff.renamelimit => diff.renameLimit in message by Max Nanasy · 13 years ago
86. dd281f0 diff: prevent pprint_rename from underrunning input by Thomas Rast · 13 years ago
87. d020e27 diff: Fix rename pretty-print when suffix and prefix overlap by Antoine Pelisse · 13 years ago
88. abea4dc Merge branch 'mp/diff-algo-config' by Junio C Hamano · 13 years ago
89. a1d68be Merge branch 'jk/diff-graph-cleanup' by Junio C Hamano · 13 years ago
90. 30997bb diff.c: use diff_line_prefix() where applicable by John Keeping · 13 years ago
91. f192223 diff: add diff_line_prefix function by John Keeping · 13 years ago
92. 32b367e diff.c: make constant string arguments const by John Keeping · 13 years ago
93. 3bf25c2 diff: write prefix to the correct file by John Keeping · 13 years ago
94. 07924d4 diff: Introduce --diff-algorithm command line option by Michal Privoznik · 13 years ago
95. 07ab4de config: Introduce diff.algorithm variable by Michal Privoznik · 13 years ago
96. 90d0b8a Merge branch 'jc/blame-no-follow' by Junio C Hamano · 13 years ago
97. a4eab8f Merge branch 'lt/diff-stat-show-0-lines' by Junio C Hamano · 13 years ago
98. 20c8cde diff --shortstat: do not count "unmerged" entries by Junio C Hamano · 13 years ago
99. 82dfc2c diff --stat: do not count "unmerged" entries by Junio C Hamano · 13 years ago
100. a20d3c0 diff --stat: move the "total count" logic to the last loop by Junio C Hamano · 13 years ago