The second batch
The most significant of this batch is of course "merge -sort". Thanks, Elijah and everybody who helped the topic. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Aug 30, 2021 at 16:06 UTC
6c40894d2466d4e7fddc047a05116aa9d14712ee
1 file changed
+29
Documentation/RelNotes/2.34.0.txt
+29
@@ -10,6 +10,10 @@ UI, Workflows & Features
10
location relative to Git installation (e.g. its $sharedir which is
11
$(prefix)/share), with "%(prefix)".
12
13
+ * Use `ort` instead of `recursive` as the default merge strategy.
14
+
15
+ * The userdiff pattern for "java" language has been updated.
16
+
17
18
Performance, Internal Implementation, Development Support etc.
19
@@ -32,6 +36,14 @@ Performance, Internal Implementation, Development Support etc.
36
"git fetch-pack" has been optimized by taking advantage of the
37
commit graph when available.
38
39
+ * Remind developers that the userdiff patterns should be kept simple
40
+ and permissive, assuming that the contents they apply are always
41
+ syntactically correct.
42
+
43
+ * The current implementation of GIT_TEST_FAIL_PREREQS is broken in
44
+ that checking for the lack of a prerequisite would not work. Avoid
45
+ the use of "if ! test_have_prereq X" in a test script.
46
+
47
48
Fixes since v2.33
49
-----------------
@@ -44,5 +56,22 @@ Fixes since v2.33
56
push" code path.
57
(merge 82823118b9 jt/push-negotiation-fixes later to maint).
58
59
+ * "git pull" had various corner cases that were not well thought out
60
+ around its --rebase backend, e.g. "git pull --ff-only" did not stop
61
+ but went ahead and rebased when the history on other side is not a
62
+ descendant of our history. The series tries to fix them up.
63
+ (merge 6f843a3355 en/pull-conflicting-options later to maint).
64
+
65
+ * "git apply" miscounted the bytes and failed to read to the end of
66
+ binary hunks.
67
+ (merge 46d723ce57 jk/apply-binary-hunk-parsing-fix later to maint).
68
+
69
+ * "git range-diff" code clean-up.
70
+ (merge c4d5907324 jk/range-diff-fixes later to maint).
71
+
72
* Other code cleanup, docfix, build fix, etc.
73
(merge 1d9c8daef8 ab/bundle-doc later to maint).
74
+ (merge 81483fe613 en/merge-strategy-docs later to maint).
75
+ (merge 626beebdf8 js/log-protocol-version later to maint).
76
+ (merge 00e302da76 cb/builtin-merge-format-string-fix later to maint).
77
+ (merge ad51ae4dc0 cb/ci-freebsd-update later to maint).