The second batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
a9f4a01760
commit
e25cabbf6b
@ -11,6 +11,22 @@ UI, Workflows & Features
|
|||||||
checking object connectivity, most useful when there are many
|
checking object connectivity, most useful when there are many
|
||||||
unrelated histories in a single repository.
|
unrelated histories in a single repository.
|
||||||
|
|
||||||
|
* "git push" has been taught to allow deletion of refs with one-level
|
||||||
|
names to help repairing a repository who acquired such a ref by
|
||||||
|
mistake. In general, we don't encourage use of such a ref, and
|
||||||
|
creation or update to such a ref is rejected as before.
|
||||||
|
|
||||||
|
* Allow "git bisect reset" to check out the original branch when the
|
||||||
|
branch is already checked out in a different worktree linked to the
|
||||||
|
same repository.
|
||||||
|
|
||||||
|
* A few subcommands have been taught to stop users from working on a
|
||||||
|
branch that is being used in another worktree linked to the same
|
||||||
|
repository.
|
||||||
|
|
||||||
|
* "git format-patch" learned to write a log-message only output file
|
||||||
|
for empty commits.
|
||||||
|
|
||||||
|
|
||||||
Performance, Internal Implementation, Development Support etc.
|
Performance, Internal Implementation, Development Support etc.
|
||||||
|
|
||||||
@ -33,4 +49,40 @@ Fixes since v2.40
|
|||||||
just like "git gc" honors them as anchoring points.
|
just like "git gc" honors them as anchoring points.
|
||||||
(merge 8d3e7eac52 jk/fsck-indices-in-worktrees later to maint).
|
(merge 8d3e7eac52 jk/fsck-indices-in-worktrees later to maint).
|
||||||
|
|
||||||
|
* Fix a segfaulting loop. The function and its caller may need
|
||||||
|
further clean-up.
|
||||||
|
(merge c5773dc078 ew/commit-reach-clean-up-flags-fix later to maint).
|
||||||
|
|
||||||
|
* "git restore" supports options like "--ours" that are only
|
||||||
|
meaningful during a conflicted merge, but these options are only
|
||||||
|
meaningful when updating the working tree files. These options are
|
||||||
|
marked to be incompatible when both "--staged" and "--worktree" are
|
||||||
|
in effect.
|
||||||
|
(merge ee8a88826a ak/restore-both-incompatible-with-conflicts later to maint).
|
||||||
|
|
||||||
|
* Simplify UI to control progress meter given by "git bundle" command.
|
||||||
|
(merge 8b95521edb jk/bundle-progress later to maint).
|
||||||
|
|
||||||
|
* "git bundle" learned that "-" is a common way to say that the input
|
||||||
|
comes from the standard input and/or the output goes to the
|
||||||
|
standard output. It used to work only for output and only from the
|
||||||
|
root level of the working tree.
|
||||||
|
(merge 0bbe10313e jk/bundle-use-dash-for-stdfiles later to maint).
|
||||||
|
|
||||||
|
* Once we start running, we assumed that the list of alternate object
|
||||||
|
databases would never change. Hook into the machinery used to
|
||||||
|
update the list of packfiles during runtime to update this list as
|
||||||
|
well.
|
||||||
|
(merge e2d003dbed ds/reprepare-alternates-when-repreparing-packfiles later to maint).
|
||||||
|
|
||||||
|
* The code to parse "git rebase -X<opt>" was not prepared to see an
|
||||||
|
unparsable option string, which has been corrected.
|
||||||
|
(merge 15a4cc912e ab/fix-strategy-opts-parsing later to maint).
|
||||||
|
|
||||||
|
* "git add -p" while the index is unmerged sometimes failed to parse
|
||||||
|
the diff output it internally produces and died, which has been
|
||||||
|
corrected.
|
||||||
|
(merge 28d1122f9c jk/add-p-unmerged-fix later to maint).
|
||||||
|
|
||||||
* Other code cleanup, docfix, build fix, etc.
|
* Other code cleanup, docfix, build fix, etc.
|
||||||
|
(merge f7111175df as/doc-markup-fix later to maint).
|
||||||
|
Loading…
Reference in New Issue
Block a user