kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

The fourteenth batch 

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Junio C Hamano 2023-10-02 11:19:18 -07:00
parent 4a0bcc832a
commit d0e8084c65
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/RelNotes/2.43.0.txt
View File

@ -193,6 +193,11 @@ Fixes since v2.42
run via the httpd, unlike ASan options, which has been corrected.
(merge 252d693797 jk/test-pass-ubsan-options-to-http-test later to maint).

* "checkout --merge -- path" and "update-index --unresolve path" did
not resurrect conflicted state that was resolved to remove path,
but now they do.
(merge 5bdedac3c7 jc/unresolve-removal later to maint).

* Other code cleanup, docfix, build fix, etc.
(merge fd3ba590d8 ws/git-push-doc-grammofix later to maint).
(merge 5f33a843de ds/upload-pack-error-sequence-fix later to maint).