Seventh batch for post 2.8 cycle
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Apr 25, 2016 at 15:18 UTC
e1f0df79a825325731d58784f0900358012a2e39
1 file changed
+22
Documentation/RelNotes/2.9.0.txt
+22
@@ -84,6 +84,11 @@ UI, Workflows & Features
84
formulating a message ID.
85
(merge f916ab0 ew/send-email-readable-message-id later to maint).
86
87
+ * "git rerere" can encounter two or more files with the same conflict
88
+ signature that have to be resolved in different ways, but there was
89
+ no way to record these separate resolutions.
90
+ (merge 890fca8 jc/rerere-multi later to maint).
91
+
92
93
Performance, Internal Implementation, Development Support etc.
94
@@ -124,6 +129,9 @@ Performance, Internal Implementation, Development Support etc.
129
Git repository.
130
(merge 274db84 jk/check-repository-format later to maint).
131
132
+ * Code restructuring around the "refs" area to prepare for pluggable
133
+ refs backends.
134
+
135
136
Also contains various documentation updates and code clean-ups.
137
@@ -254,6 +262,20 @@ notes for details).
262
See http://thread.gmane.org/gmane.comp.version-control.git/291853
263
(merge e53a64b ad/cygwin-wants-rename later to maint).
264
265
+ * "merge-octopus" strategy did not ensure that the index is clean
266
+ when merge begins.
267
+
268
+ * When "git merge" notices that the merge can be resolved purely at
269
+ the tree level (without having to merge blobs) and the resulting
270
+ tree happens to already exist in the object store, it forgot to
271
+ update the index, which lead to an inconsistent state for later
272
+ operations.
273
+
274
+ * "git submodule" reports the paths of submodules the command
275
+ recurses into, but this was incorrect when the command was not run
276
+ from the root level of the superproject.
277
+ (merge 2ab5660 sb/submodule-path-misc-bugs later to maint).
278
+
279
* Other minor clean-ups and documentation updates
280
(merge aed7480 mm/lockfile-error-message later to maint).
281
(merge bfee614 jc/index-pack later to maint).