@@ -107,6 +107,19 @@ UI, Workflows & Features
107
107
in /usr/lib and /usr/sbin; extend the list of locations to be
108
108
checked to also include directories on $PATH.
109
109
110
+ * "git diff" learned, "--anchored", a variant of the "--patience"
111
+ algorithm, to which the user can specify which 'unique' line to be
112
+ used as anchoring points.
113
+
114
+ * The way "git worktree add" determines what branch to create from
115
+ where and checkout in the new worktree has been updated a bit.
116
+
117
+ * Ancient part of codebase still shows dots after an abbreviated
118
+ object name just to show that it is not a full object name, but
119
+ these ellipses are confusing to people who newly discovered Git
120
+ who are used to seeing abbreviated object names and find them
121
+ confusing with the range syntax.
122
+
110
123
111
124
Performance, Internal Implementation, Development Support etc.
112
125
@@ -163,6 +176,13 @@ Performance, Internal Implementation, Development Support etc.
163
176
* An internal function that was left for backward compatibility has
164
177
been removed, as there is no remaining callers.
165
178
179
+ * Historically, the diff machinery for rename detection had a
180
+ hardcoded limit of 32k paths; this is being lifted to allow users
181
+ trade cycles with a (possibly) easier to read result.
182
+
183
+ * The tracing infrastructure has been optimized for cases where no
184
+ tracing is requested.
185
+
166
186
Also contains various documentation updates and code clean-ups.
167
187
168
188
@@ -329,6 +349,31 @@ Fixes since v2.15
329
349
* A regression in the progress eye-candy was fixed.
330
350
(merge 9c5951cacf jk/progress-delay-fix later to maint).
331
351
352
+ * The code internal to the recursive merge strategy was not fully
353
+ prepared to see a path that is renamed to try overwriting another
354
+ path that is only different in case on case insensitive systems.
355
+ This does not matter in the current code, but will start to matter
356
+ once the rename detection logic starts taking hints from nearby
357
+ paths moving to some directory and moves a new path along with them.
358
+ (merge 4cba2b0108 en/merge-recursive-icase-removal later to maint).
359
+
360
+ * An v2.12-era regression in pathspec match logic, which made it look
361
+ into submodule tree even when it is not desired, has been fixed.
362
+ (merge eef3df5a93 bw/pathspec-match-submodule-boundary later to maint).
363
+
364
+ * Amending commits in git-gui broke the author name that is non-ascii
365
+ due to incorrect enconding conversion.
366
+
367
+ * Recent update to the submodule configuration code broke "diff-tree"
368
+ by accidentally stopping to read from the index upfront.
369
+ (merge fd66bcc31f bw/submodule-config-cleanup later to maint).
370
+
371
+ * Git shows a message to tell the user that it is waiting for the
372
+ user to finish editing when spawning an editor, in case the editor
373
+ opens to a hidden window or somewhere obscure and the user gets
374
+ lost.
375
+ (merge abfb04d0c7 ls/editor-waiting-message later to maint).
376
+
332
377
* Other minor doc, test and build updates and code cleanups.
333
378
(merge 1a1fc2d5b5 rd/man-prune-progress later to maint).
334
379
(merge 0ba014035a rd/man-reflog-add-n later to maint).
@@ -338,3 +383,4 @@ Fixes since v2.15
338
383
(merge 5a0526264b tg/t-readme-updates later to maint).
339
384
(merge 5e83cca0b8 jk/no-optional-locks later to maint).
340
385
(merge 826c778f7c js/hashmap-update-sample later to maint).
386
+ (merge 176b2d328c sg/setup-doc-update later to maint).
0 commit comments