freshlybakedca.ke
Git fork
Sync with 'maint'
Signed-off-by: Junio C Hamano <gitster@pobox.com>
+37
-10
+37
Documentation/RelNotes/2.46.1.txt
+37
Documentation/RelNotes/2.46.1.txt
···
1
+
Git 2.46.1 Release Notes
2
+
========================
3
+
4
+
This release is primarily to merge fixes accumulated on the 'master'
5
+
front to prepare for 2.47 release that are still relevant to 2.46.x
6
+
maintenance track.
7
+
8
+
Fixes since Git 2.46
9
+
--------------------
10
+
11
+
* "git checkout --ours" (no other arguments) complained that the
12
+
option is incompatible with branch switching, which is technically
13
+
correct, but found confusing by some users. It now says that the
14
+
user needs to give pathspec to specify what paths to checkout.
15
+
16
+
* It has been documented that we avoid "VAR=VAL shell_func" and why.
17
+
18
+
* "git add -p" by users with diff.suppressBlankEmpty set to true
19
+
failed to parse the patch that represents an unmodified empty line
20
+
with an empty line (not a line with a single space on it), which
21
+
has been corrected.
22
+
23
+
* "git rebase --help" referred to "offset" (the difference between
24
+
the location a change was taken from and the change gets replaced)
25
+
incorrectly and called it "fuzz", which has been corrected.
26
+
27
+
* "git notes add -m '' --allow-empty" and friends that take prepared
28
+
data to create notes should not invoke an editor, but it started
29
+
doing so since Git 2.42, which has been corrected.
30
+
31
+
* An expensive operation to prepare tracing was done in re-encoding
32
+
code path even when the tracing was not requested, which has been
33
+
corrected.
34
+
35
+
* Perforce tests have been updated.
36
+
37
+
Also contains minor documentation updates and code clean-ups.
-10
Documentation/RelNotes/2.47.0.txt
-10
Documentation/RelNotes/2.47.0.txt
···
75
75
failed to parse the patch that represents an unmodified empty line
76
76
with an empty line (not a line with a single space on it), which
77
77
has been corrected.
78
-
(merge 60cf761ed1 pw/add-patch-with-suppress-blank-empty later to maint).
79
78
80
79
* "git checkout --ours" (no other arguments) complained that the
81
80
option is incompatible with branch switching, which is technically
82
81
correct, but found confusing by some users. It now says that the
83
82
user needs to give pathspec to specify what paths to checkout.
84
-
(merge d1e6c61272 jc/checkout-no-op-switch-errors later to maint).
85
83
86
84
* It has been documented that we avoid "VAR=VAL shell_func" and why.
87
-
(merge 728a1962cd jc/doc-one-shot-export-with-shell-func later to maint).
88
85
89
86
* "git rebase --help" referred to "offset" (the difference between
90
87
the location a change was taken from and the change gets replaced)
91
88
incorrectly and called it "fuzz", which has been corrected.
92
-
(merge 70058db385 jc/doc-rebase-fuzz-vs-offset-fix later to maint).
93
89
94
90
* "git notes add -m '' --allow-empty" and friends that take prepared
95
91
data to create notes should not invoke an editor, but it started
96
92
doing so since Git 2.42, which has been corrected.
97
-
(merge 8b426c84f3 dd/notes-empty-no-edit-by-default later to maint).
98
93
99
94
* An expensive operation to prepare tracing was done in re-encoding
100
95
code path even when the tracing was not requested, which has been
101
96
corrected.
102
-
(merge 63ad8dbf16 dh/encoding-trace-optim later to maint).
103
97
104
98
* More leakfixes.
105
99
(merge f30bfafcd4 ps/leakfixes-part-3 later to maint).
···
143
137
(merge a77554ea09 xx/diff-tree-remerge-diff-fix later to maint).
144
138
145
139
* Other code cleanup, docfix, build fix, etc.
146
-
(merge 8db8786fc2 jt/doc-post-receive-hook-update later to maint).
147
-
(merge 1c473dd6af tn/doc-commit-fix later to maint).
148
140
(merge bb0498b1bb jc/how-to-maintain-updates later to maint).
149
-
(merge 6e71d6ac7c ks/unit-test-comment-typofix later to maint).
150
-
(merge 63ee933383 ps/p4-tests-updates later to maint).
151
141
(merge 7c7516b8db jc/jl-git-no-advice-fix later to maint).
152
142
(merge c3d034df16 jc/leakfix-hashfile later to maint).
153
143
(merge d98d9c77e5 jc/leakfix-mailmap later to maint).