mirror of
https://github.com/git/git
synced 2024-10-02 14:45:21 +00:00
The sixth batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
4c237d2ca2
commit
9748a68200
|
@ -31,6 +31,10 @@ Performance, Internal Implementation, Development Support etc.
|
||||||
|
|
||||||
* "git worktree" learned to work better with sparse index feature.
|
* "git worktree" learned to work better with sparse index feature.
|
||||||
|
|
||||||
|
* When the external merge driver is killed by a signal, its output
|
||||||
|
should not be trusted as a resolution with conflicts that is
|
||||||
|
proposed by the driver, but the code did.
|
||||||
|
|
||||||
|
|
||||||
Fixes since v2.41
|
Fixes since v2.41
|
||||||
-----------------
|
-----------------
|
||||||
|
@ -117,6 +121,11 @@ Fixes since v2.41
|
||||||
between the way the code enumerates packfiles in the repository.
|
between the way the code enumerates packfiles in the repository.
|
||||||
(merge 73320e49ad tb/collect-pack-filenames-fix later to maint).
|
(merge 73320e49ad tb/collect-pack-filenames-fix later to maint).
|
||||||
|
|
||||||
|
* We create .pack and then .idx, we consider only packfiles that have
|
||||||
|
.idx usable (those with only .pack are not ready yet), so we should
|
||||||
|
remove .idx before removing .pack for consistency.
|
||||||
|
(merge 0dd1324a73 ds/remove-idx-before-pack later to maint).
|
||||||
|
|
||||||
* Other code cleanup, docfix, build fix, etc.
|
* Other code cleanup, docfix, build fix, etc.
|
||||||
(merge 51f9d2e563 sa/doc-ls-remote later to maint).
|
(merge 51f9d2e563 sa/doc-ls-remote later to maint).
|
||||||
(merge c6d26a9dda jk/format-patch-message-id-unleak later to maint).
|
(merge c6d26a9dda jk/format-patch-message-id-unleak later to maint).
|
||||||
|
|
Loading…
Reference in a new issue