The fourth batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Apr 10, 2019 at 02:19 UTC
e35b8cb8e212e3557efc565157ceb5cbaaf0d87f
1 file changed
+39
Documentation/RelNotes/2.22.0.txt
+39
@@ -36,6 +36,12 @@ UI, Workflows & Features
36
a merge commit. This has been updated to use a more modern and
37
human readable output that still is concise enough.
38
39
+ * "git rebase --rebase-merges" replaces its old "--preserve-merges"
40
+ option; the latter is now marked as deprecated.
41
+
42
+ * Error message given while cloning with --recurse-submodules has
43
+ been updated.
44
+
45
46
Performance, Internal Implementation, Development Support etc.
47
@@ -55,6 +61,9 @@ Performance, Internal Implementation, Development Support etc.
61
* The command line parser of "git commit-tree" has been rewritten to
62
use the parse-options API.
63
64
+ * Suggest GitGitGadget instead of submitGit as a way to submit
65
+ patches based on GitHub PR to us.
66
+
67
68
Fixes since v2.21
69
-----------------
@@ -134,6 +143,31 @@ Fixes since v2.21
143
now fixed.
144
(merge cd8e7593b9 jk/config-type-color-ends-with-lf later to maint).
145
146
+ * When the "clean" filter can reduce the size of a huge file in the
147
+ working tree down to a small "token" (a la Git LFS), there is no
148
+ point in allocating a huge scratch area upfront, but the buffer is
149
+ sized based on the original file size. The convert mechanism now
150
+ allocates very minimum and reallocates as it receives the output
151
+ from the clean filter process.
152
+ (merge 02156ab031 jh/resize-convert-scratch-buffer later to maint).
153
+
154
+ * "git rebase" uses the refs/rewritten/ hierarchy to store its
155
+ intermediate states, which inherently makes the hierarchy per
156
+ worktree, but it didn't quite work well.
157
+ (merge b9317d55a3 nd/rewritten-ref-is-per-worktree later to maint).
158
+
159
+ * "git log -L<from>,<to>:<path>" with "-s" did not suppress the patch
160
+ output as it should. This has been corrected.
161
+ (merge 05314efaea jk/line-log-with-patch later to maint).
162
+
163
+ * "git worktree add" used to do a "find an available name with stat
164
+ and then mkdir", which is race-prone. This has been fixed by using
165
+ mkdir and reacting to EEXIST in a loop.
166
+ (merge 7af01f2367 ms/worktree-add-atomic-mkdir later to maint).
167
+
168
+ * Build update for SHA-1 with collision detection.
169
+ (merge 07a20f569b jk/sha1dc later to maint).
170
+
171
* Code cleanup, docfix, build fix, etc.
172
(merge 11f470aee7 jc/test-yes-doc later to maint).
173
(merge 90503a240b js/doc-symref-in-proto-v1 later to maint).
@@ -148,3 +182,8 @@ Fixes since v2.21
182
(merge 716a5af812 rd/gc-prune-doc-fix later to maint).
183
(merge 50b206371d js/untravis-windows later to maint).
184
(merge dbf47215e3 js/rebase-recreate-merge later to maint).
185
+ (merge 56cb2d30f8 dl/reset-doc-no-wrt-abbrev later to maint).
186
+ (merge 64eca306a2 ja/dir-rename-doc-markup-fix later to maint).
187
+ (merge af91b0230c dl/ignore-docs later to maint).
188
+ (merge 59a06e947b ra/t3600-test-path-funcs later to maint).
189
+ (merge e041d0781b ar/t4150-remove-cruft later to maint).