Second batch for 2.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Aug 12, 2015 at 14:16 UTC
130be8eeb8b9b7c89751c3cab3bc54dc6f2d43e6
1 file changed
+25
Documentation/RelNotes/2.6.0.txt
+25
@@ -82,6 +82,19 @@ Performance, Internal Implementation, Development Support etc.
82
* Ref listing by "git branch -l" and "git tag -l" commands has
83
started to be rebuilt, based on the for-each-ref machinery.
84
85
+ * The code to perform multi-tree merges has been taught to repopulate
86
+ the cache-tree upon a successful merge into the index, so that
87
+ subsequent "diff-index --cached" (hence "status") and "write-tree"
88
+ (hence "commit") will go faster.
89
+
90
+ The same logic in "git checkout" may now be removed, but that is a
91
+ separate issue.
92
+
93
+ * Tests that assume how reflogs are represented on the filesystem too
94
+ much have been corrected.
95
+
96
+ * "git am" has been rewritten in "C".
97
+
98
99
Also contains various documentation updates and code clean-ups.
100
@@ -148,7 +161,19 @@ notes for details).
161
with a more optimized check.
162
(merge 38ae878 ee/clean-remove-dirs later to maint).
163
164
+ * The "new-worktree-mode" hack in "checkout" that was added in
165
+ nd/multiple-work-trees topic has been removed by updating the
166
+ implementation of new "worktree add".
167
+ (merge 65f9b75 es/worktree-add-cleanup later to maint).
168
+
169
+ * Remove remaining cruft from "git checkout --to", which
170
+ transitioned to "git worktree add".
171
+ (merge 114ff88 es/worktree-add later to maint).
172
+
173
* Code cleanups and documentation updates.
174
(merge 1c601af es/doc-clean-outdated-tools later to maint).
175
(merge 3581304 kn/tag-doc-fix later to maint).
176
(merge 3a59e59 kb/i18n-doc later to maint).
177
+ (merge 45abdee sb/remove-unused-var-from-builtin-add later to maint).
178
+ (merge 14691e3 sb/parse-options-codeformat later to maint).
179
+ (merge 4a6ada3 ad/bisect-cleanup later to maint).