@@ -107,6 +107,15 @@ UI, Workflows & Features
107
107
commit."
108
108
(merge 7550424 js/name-rev-use-oldest-ref later to maint).
109
109
110
+ * "git clone" learned "--shallow-submodules" option.
111
+
112
+ * HTTP transport clients learned to throw extra HTTP headers at the
113
+ server, specified via http.extraHeader configuration variable.
114
+
115
+ * Patch output from "git diff" and friends has been tweaked to be
116
+ more readable by using a blank line as a strong hint that the
117
+ contents before and after it belong to a logically separate unit.
118
+
110
119
111
120
Performance, Internal Implementation, Development Support etc.
112
121
@@ -161,6 +170,16 @@ Performance, Internal Implementation, Development Support etc.
161
170
* "merge-recursive" strategy incorrectly checked if a path that is
162
171
involved in its internal merge exists in the working tree.
163
172
173
+ * The test scripts for "git p4" (but not "git p4" implementation
174
+ itself) has been updated so that they would work even on a system
175
+ where the installed version of Python is python 3.
176
+ (merge 1fb3fb4 ld/p4-test-py3 later to maint).
177
+
178
+ * As nobody maintains our in-tree git.spec.in and distros use their
179
+ own spec file, we stopped pretending that we support "make rpm".
180
+
181
+ * Move from unsigned char[20] to struct object_id continues.
182
+
164
183
165
184
Also contains various documentation updates and code clean-ups.
166
185
@@ -303,7 +322,7 @@ notes for details).
303
322
for these ref updates blocked on writing them to the main thread,
304
323
after the main thread at the receiving end notices that the push
305
324
failed and decides not to read these notices and return a failure.
306
- (merge c4b2751 jk/push-client-deadlock-fix later to maint).
325
+ (merge f924b52a jk/push-client-deadlock-fix later to maint).
307
326
308
327
* mmap emulation on Windows has been optimized and work better without
309
328
consuming paging store when not needed.
@@ -316,11 +335,20 @@ notes for details).
316
335
* UI consistency improvements for "git mergetool".
317
336
(merge cce076e nf/mergetool-prompt later to maint).
318
337
338
+ * "git rebase -m" could be asked to rebase an entire branch starting
339
+ from the root, but failed by assuming that there always is a parent
340
+ commit to the first commit on the branch.
341
+ (merge 79f4344 bw/rebase-merge-entire-branch later to maint).
342
+
343
+ * Fix a broken "p4 lfs" test.
344
+ (merge 9e220fe ls/p4-lfs-test-fix-2.7.0 later to maint).
345
+
319
346
* Other minor clean-ups and documentation updates
320
347
(merge 8b5a3e9 kn/for-each-tag-branch later to maint).
321
- (merge 9c60d9f sb/misc-cleanups later to maint).
348
+ (merge 99dab16 sb/misc-cleanups later to maint).
322
349
(merge 7a6a44c cc/apply later to maint).
323
350
(merge 6594883 nd/remove-unused later to maint).
324
351
(merge 0ff7410 sg/test-lib-simplify-expr-away later to maint).
325
352
(merge 060e776 jk/fix-attribute-macro-in-2.5 later to maint).
326
353
(merge d16df0c rt/string-list-lookup-cleanup later to maint).
354
+ (merge 376eb60 sb/config-exit-status-list later to maint).
0 commit comments