@@ -74,6 +74,13 @@ UI, Workflows & Features
74
74
git cmd" to run a Git command that works on a bare repository without
75
75
explicitly specifying $GIT_DIR now.
76
76
77
+ * The completion script (in contrib/) learned more options that can
78
+ be used with "git log".
79
+
80
+ * The labels on conflict markers for the common ancestor, our version,
81
+ and the other version are available to custom 3-way merge driver
82
+ via %S, %X, and %Y placeholders.
83
+
77
84
78
85
Performance, Internal Implementation, Development Support etc.
79
86
@@ -125,6 +132,8 @@ Performance, Internal Implementation, Development Support etc.
125
132
* A few tests to "git commit -o <pathspec>" and "git commit -i
126
133
<pathspec>" has been added.
127
134
135
+ * Tests on ref API are moved around to prepare for reftable.
136
+
128
137
129
138
Fixes since v2.43
130
139
-----------------
@@ -247,6 +256,15 @@ Fixes since v2.43
247
256
http (aka stateless) transport.
248
257
(merge 176cd68634 jx/remote-archive-over-smart-http later to maint).
249
258
259
+ * Fetching via protocol v0 over Smart HTTP transport sometimes failed
260
+ to correctly auto-follow tags.
261
+ (merge fba732c462 jk/fetch-auto-tag-following-fix later to maint).
262
+
263
+ * The documentation for the --exclude-per-directory option marked it
264
+ as deprecated, which confused readers into thinking there may be a
265
+ plan to remove it in the future, which was not our intention.
266
+ (merge 0009542cab jc/ls-files-doc-update later to maint).
267
+
250
268
* Other code cleanup, docfix, build fix, etc.
251
269
(merge 50f1abcff6 js/packfile-h-typofix later to maint).
252
270
(merge cbf498eb53 jb/reflog-expire-delete-dry-run-options later to maint).
@@ -286,3 +304,4 @@ Fixes since v2.43
286
304
(merge f10031fadd nb/rebase-x-shell-docfix later to maint).
287
305
(merge af3d2c160f jc/majordomo-to-subspace later to maint).
288
306
(merge ee9895b0ff sd/negotiate-trace-fix later to maint).
307
+ (merge 976d0251ce jc/coc-whitespace-fix later to maint).
0 commit comments