Git 2.1.3

1. a28e876 Merge branch 'jn/unpack-trees-checkout-m-carry-deletion' into maint by Junio C Hamano · 11 years ago
2. 6a143aa checkout -m: attempt merge when deletion of path was staged by Jonathan Nieder · 11 years ago
3. 6c1db1b unpack-trees: use 'cuddled' style for if-else cascade by Jonathan Nieder · 11 years ago
4. 0ecd180 unpack-trees: simplify 'all other failures' case by Stefan Beller · 11 years ago
5. 788cef8 Merge branch 'nd/split-index' by Junio C Hamano · 11 years ago
6. 3b8e8af Merge branch 'jk/xstrfmt' by Junio C Hamano · 11 years ago
7. ccdd4a0 cleanup duplicate name_compare() functions by Jeremiah Mahler · 11 years ago
8. fa3f60b use xstrfmt in favor of manual size calculations by Jeff King · 11 years ago
9. 078a58e read-cache: mark updated entries for split index by Nguyễn Thái Ngọc Duy · 12 years ago
10. 5fc2fc8 read-cache: split-index mode by Nguyễn Thái Ngọc Duy · 12 years ago
11. e93021b read-cache: save index SHA-1 after reading by Nguyễn Thái Ngọc Duy · 12 years ago
12. d4a2024 entry.c: update cache_changed if refresh_cache is set in checkout_entry() by Nguyễn Thái Ngọc Duy · 12 years ago
13. a5400ef cache-tree: mark istate->cache_changed on cache tree invalidation by Nguyễn Thái Ngọc Duy · 12 years ago
14. a5c446f unpack-trees: be specific what part of the index has changed by Nguyễn Thái Ngọc Duy · 12 years ago
15. 0963008 Merge branch 'nd/i18n-progress' by Junio C Hamano · 12 years ago
16. d637d1b Merge branch 'kb/fast-hashmap' by Junio C Hamano · 12 years ago
17. 754dbc4 i18n: mark all progress lines for translation by Nguyễn Thái Ngọc Duy · 12 years ago
18. 4766036 Merge branch 'jk/two-way-merge-corner-case-fix' into maint by Junio C Hamano · 12 years ago
19. fc2b621 Prevent buffer overflows when path is too long by Antoine Pelisse · 12 years ago
20. 3979580 Merge branch 'jk/two-way-merge-corner-case-fix' by Junio C Hamano · 12 years ago
21. 419a597 name-hash.c: remove cache entries instead of marking them CE_UNHASHED by Karsten Blees · 12 years ago
22. 8b01378 name-hash.c: use new hash map implementation for cache entries by Karsten Blees · 12 years ago
23. b018ff6 unpack-trees: fix "read-tree -u --reset A B" with conflicted index by Jeff King · 12 years ago
24. ebbd743 employ new explicit "exists in index?" API by Eric Sunshine · 12 years ago
25. e28f764 unpack-trees: plug a memory leak by Felipe Contreras · 12 years ago
26. 9c5e6c8 Convert "struct cache_entry *" to "const ..." wherever possible by Nguyễn Thái Ngọc Duy · 12 years ago
27. bd21822 Merge branch 'rs/unpack-trees-tree-walk-conflict-field' by Junio C Hamano · 12 years ago
28. 603d249 unpack-trees: don't shift conflicts left and right by René Scharfe · 12 years ago
29. 5d80ef5 unpack-trees: free cache_entry array members for merges by René Scharfe · 13 years ago
30. 5828e83 diff-lib, read-tree, unpack-trees: mark cache_entry array paramters const by René Scharfe · 13 years ago
31. eb9ae4b diff-lib, read-tree, unpack-trees: mark cache_entry pointers const by René Scharfe · 13 years ago
32. f2fa354 unpack-trees: create working copy of merge entry in merged_entry by René Scharfe · 13 years ago
33. a33bd4d unpack-trees: factor out dup_entry by René Scharfe · 13 years ago
34. b07bc8c dir.c: replace is_path_excluded with now equivalent is_excluded API by Karsten Blees · 13 years ago
35. a39b15b Merge branch 'as/check-ignore' by Junio C Hamano · 13 years ago
36. d912b0e Merge branch 'as/dir-c-cleanup' by Junio C Hamano · 13 years ago
37. c082df2 dir.c: use a single struct exclude_list per source of excludes by Adam Spiers · 13 years ago
38. f619881 dir.c: rename free_excludes() to clear_exclude_list() by Adam Spiers · 13 years ago
39. 0795805 dir.c: rename excluded_from_list() to is_excluded_from_list() by Adam Spiers · 13 years ago
40. 9013089 dir.c: rename path_excluded() to is_path_excluded() by Adam Spiers · 13 years ago
41. 686b2de oneway_merge(): only lstat() when told to update worktree by Martin von Zweigbergk · 13 years ago
42. 30ea575 Merge branch 'tg/ce-namelen-field' by Junio C Hamano · 13 years ago
43. cd733f4 Merge branch 'jc/ls-files-i-dir' into maint by Junio C Hamano · 13 years ago
44. b60e188 Strip namelen out of ce_flags into a ce_namelen field by Thomas Gummerer · 13 years ago
45. 68c4f6a Replace strlen() with ce_namelen() by Thomas Gummerer · 13 years ago
46. 1966bab Merge branch 'jc/ls-files-i-dir' by Junio C Hamano · 13 years ago
47. 589570d unpack-trees.c: use path_excluded() in check_ok_to_remove() by Junio C Hamano · 14 years ago
48. adc7052 Merge branch 'maint' by Junio C Hamano · 14 years ago
49. cb8ad28 Consistently use "superproject" instead of "supermodule" by Jens Lehmann · 14 years ago
50. 2fa4fff Merge branch 'pw/message-cleanup' by Junio C Hamano · 14 years ago
51. d4a5d87 Merge branch 'jc/index-v4' by Junio C Hamano · 14 years ago
52. 82247e9 remove superfluous newlines in error messages by Pete Wyckoff · 14 years ago
53. 9170c7a unpack-trees: preserve the index file version of original by Junio C Hamano · 14 years ago
54. 6ff264e unpack-trees: plug minor memory leak by René Scharfe · 14 years ago
55. 97e5954 unpack-trees: don't perform any index operation if we're not merging by René Scharfe · 14 years ago
56. 0de1633 tree-walk.c: do not leak internal structure in tree_entry_len() by Nguyễn Thái Ngọc Duy · 14 years ago
57. 08ec3b5 Merge branch 'nd/maint-sparse-errors' by Junio C Hamano · 14 years ago
58. 5fbef46 Merge branch 'mg/maint-doc-sparse-checkout' by Junio C Hamano · 14 years ago
59. 1b840a5 Merge branch 'jc/diff-index-unpack' by Junio C Hamano · 14 years ago
60. a7bc906 Add explanation why we do not allow to sparse checkout to empty working tree by Nguyễn Thái Ngọc Duy · 14 years ago
61. 17d26a4 sparse checkout: show error messages when worktree shaping fails by Nguyễn Thái Ngọc Duy · 14 years ago
62. 6f90969 unpack-trees: print "Aborting" to stderr by Michael J Gruber · 14 years ago
63. 40e3725 unpack-trees: allow pruning with pathspec by Junio C Hamano · 14 years ago
64. b35acb5 Merge branch 'maint' by Junio C Hamano · 14 years ago
65. d5b6629 Break down no-lstat() condition checks in verify_uptodate() by Nguyễn Thái Ngọc Duy · 14 years ago
66. 57e4d61 Merge branch 'jc/diff-index-quick-exit-early' by Junio C Hamano · 14 years ago
67. b419482 diff-index --quiet: learn the "stop feeding the backend early" logic by Junio C Hamano · 15 years ago
68. 2c9078d unpack-trees: add the dry_run flag to unpack_trees_options by Jens Lehmann · 15 years ago
69. 2891109 sparse checkout: do not eagerly decide the fate for whole directory by Nguyễn Thái Ngọc Duy · 15 years ago
70. c2e86ad Fix sparse warnings by Stephen Boyd · 15 years ago
71. 4e363b1 Revert "unpack_trees(): skip trees that are the same in all input" by Junio C Hamano · 15 years ago
72. 7551391 Merge branch 'jc/unpack-trees' by Junio C Hamano · 15 years ago
73. 5bb20ec Merge branch 'jn/unpack-lstat-failure-report' by Junio C Hamano · 15 years ago
74. a93e530 unpack-trees: handle lstat failure for existing file by Jonathan Nieder · 15 years ago
75. 92fda79 unpack-trees: handle lstat failure for existing directory by Jonathan Nieder · 15 years ago
76. 83c9031 unpack_trees(): skip trees that are the same in all input by Junio C Hamano · 15 years ago
77. e39212a Merge branch 'nd/maint-fix-add-typo-detection' by Junio C Hamano · 15 years ago
78. 84563a6 unpack-trees.c: cosmetic fix by Junio C Hamano · 15 years ago
79. 3055d78 use persistent memory for rejected paths by Clemens Buchacher · 15 years ago
80. b1735b1 do not overwrite files in leading path by Clemens Buchacher · 15 years ago
81. 6838d1a add function check_ok_to_remove() by Clemens Buchacher · 15 years ago
82. 9037026 unpack-trees: fix sparse checkout's "unable to match directories" by Nguyễn Thái Ngọc Duy · 15 years ago
83. 2431afb unpack-trees: move all skip-worktree checks back to unpack_trees() by Nguyễn Thái Ngọc Duy · 15 years ago
84. 0fd0e24 dir.c: add free_excludes() by Nguyễn Thái Ngọc Duy · 15 years ago
85. 7980872 use persistent memory for rejected paths by Clemens Buchacher · 15 years ago
86. f66caaf do not overwrite files in leading path by Clemens Buchacher · 15 years ago
87. a9307f5 add function check_ok_to_remove() by Clemens Buchacher · 15 years ago
88. c208e05 Merge branch 'dg/local-mod-error-messages' by Junio C Hamano · 15 years ago
89. 5e65ee3 Move "show_all_errors = 1" to setup_unpack_trees_porcelain() by Matthieu Moy · 15 years ago
90. e294030 setup_unpack_trees_porcelain: take the whole options struct as parameter by Matthieu Moy · 15 years ago
91. dc1166e Move set_porcelain_error_msgs to unpack-trees.c and rename it by Matthieu Moy · 15 years ago
92. c3b9325 Merge branch 'nd/fix-sparse-checkout' by Junio C Hamano · 15 years ago
93. 2eb5469 Merge branch 'dg/local-mod-error-messages' by Junio C Hamano · 15 years ago
94. e6c111b unpack_trees: group error messages by type by Matthieu Moy · 15 years ago
95. 08402b0 merge-recursive: distinguish "removed" and "overwritten" messages by Matthieu Moy · 15 years ago
96. 23cbf11 merge-recursive: porcelain messages for checkout by Diane Gasselin · 15 years ago
97. 08353eb Turn unpack_trees_options.msgs into an array + enum by Matthieu Moy · 15 years ago
98. 1ce584b read-tree: stop leaking tree objects by Jonathan Nieder · 15 years ago
99. 74da98f unpack-trees: mark new entries skip-worktree appropriately by Nguyễn Thái Ngọc Duy · 15 years ago
100. 711f151 unpack-trees: do not check for conflict entries too early by Nguyễn Thái Ngọc Duy · 15 years ago