diff --git a/RelNotes/2.53.0.adoc b/RelNotes/2.53.0.adoc index 38cbd2186..41ae2a5a7 100644 --- a/RelNotes/2.53.0.adoc +++ b/RelNotes/2.53.0.adoc @@ -26,6 +26,11 @@ UI, Workflows & Features * The use of "revision" (a connected set of commits) has been clarified in the "git replay" documentation. + * A help message from "git branch" now mentions "git help" instead of + "man" when suggesting to read some documentation. + + * "git repo struct" learned to take "-z" as a synonym to "--format=nul". + Performance, Internal Implementation, Development Support etc. -------------------------------------------------------------- @@ -51,6 +56,10 @@ Performance, Internal Implementation, Development Support etc. * Code refactoring around object database sources. + * Halve the memory consumed by artificial filepairs created during + "git diff --find-copioes-harder", also making the operation run + faster. + Fixes since v2.52 ----------------- @@ -150,9 +159,18 @@ Fixes since v2.52 * The way patience diff finds LCS has been optimized. (merge c7e3b8085b yc/xdiff-patience-optim later to maint). + * Recent optimization to "last-modified" command introduced use of + uninitialized block of memory, which has been corrected. + (merge fe4e60759b tc/last-modified-active-paths-optimization later to maint). + + * "git last-modified" used to mishandle "--" to mark the beginning of + pathspec, which has been corrected. + (merge 05491b90ce js/last-modified-with-sparse-checkouts later to maint). + * Other code cleanup, docfix, build fix, etc. (merge 46207a54cc qj/doc-http-bad-want-response later to maint). (merge df90eccd93 kh/doc-commit-extra-references later to maint). (merge f18aa68861 rs/xmkstemp-simplify later to maint). (merge fddba8f737 ja/doc-synopsis-style later to maint). (merge 22ce0cb639 en/xdiff-cleanup-2 later to maint). + (merge 8ef7355a8f je/doc-pull later to maint). diff --git a/git-pull.adoc b/git-pull.adoc index 248f6c3f3..88f4fd392 100644 --- a/git-pull.adoc +++ b/git-pull.adoc @@ -37,8 +37,8 @@ You can also set the configuration options `pull.rebase`, `pull.squash`, or `pull.ff` with your preferred behaviour. If there's a merge conflict during the merge or rebase that you don't -want to handle, you can safely abort it with `git merge --abort` or `git ---rebase abort`. +want to handle, you can safely abort it with `git merge --abort` or +`git rebase --abort`. OPTIONS ------- diff --git a/git-pull.html b/git-pull.html index f144f70af..de3428d6e 100644 --- a/git-pull.html +++ b/git-pull.html @@ -497,8 +497,8 @@

DESCRIPTION

If there’s a merge conflict during the merge or rebase that you don’t -want to handle, you can safely abort it with git merge --abort or git ---rebase abort.

+want to handle, you can safely abort it with git merge --abort or +git rebase --abort.

@@ -1967,7 +1967,7 @@

GIT

diff --git a/git-repo.adoc b/git-repo.adoc index 70f0a6d2e..c4a78277d 100644 --- a/git-repo.adoc +++ b/git-repo.adoc @@ -8,8 +8,8 @@ git-repo - Retrieve information about the repository SYNOPSIS -------- [synopsis] -git repo info [--format=(keyvalue|nul)] [-z] [--all | ...] -git repo structure [--format=(table|keyvalue|nul)] +git repo info [--format=(keyvalue|nul) | -z] [--all | ...] +git repo structure [--format=(table|keyvalue|nul) | -z] DESCRIPTION ----------- @@ -19,7 +19,7 @@ THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE. COMMANDS -------- -`info [--format=(keyvalue|nul)] [-z] [--all | ...]`:: +`info [--format=(keyvalue|nul) | -z] [--all | ...]`:: Retrieve metadata-related information about the current repository. Only the requested data will be returned based on their keys (see "INFO KEYS" section below). @@ -44,13 +44,12 @@ supported: + `-z` is an alias for `--format=nul`. -`structure [--format=(table|keyvalue|nul)]`:: +`structure [--format=(table|keyvalue|nul) | -z]`:: Retrieve statistics about the current repository structure. The following kinds of information are reported: + * Reference counts categorized by type * Reachable object counts categorized by type - + The output format can be chosen through the flag `--format`. Three formats are supported: @@ -72,6 +71,8 @@ supported: the delimiter between the key and value instead of '='. Unlike the `keyvalue` format, values containing "unusual" characters are never quoted. ++ +`-z` is an alias for `--format=nul`. INFO KEYS --------- diff --git a/git-repo.html b/git-repo.html index 610f22be8..74282b7ef 100644 --- a/git-repo.html +++ b/git-repo.html @@ -452,8 +452,8 @@

NAME

SYNOPSIS

-
git repo info [--format=(keyvalue|nul)] [-z] [--all | <key>…​]
-git repo structure [--format=(table|keyvalue|nul)]
+
git repo info [--format=(keyvalue|nul) | -z] [--all | <key>…​]
+git repo structure [--format=(table|keyvalue|nul) | -z]
@@ -473,7 +473,7 @@

COMMANDS

-
info [--format=(keyvalue|nul)] [-z] [--all | <key>...]
+
info [--format=(keyvalue|nul) | -z] [--all | <key>...]

Retrieve metadata-related information about the current repository. Only the requested data will be returned based on their keys (see "INFO KEYS" @@ -508,7 +508,7 @@

COMMANDS

-
structure [--format=(table|keyvalue|nul)]
+
structure [--format=(table|keyvalue|nul) | -z]

Retrieve statistics about the current repository structure. The following kinds of information are reported:

@@ -519,16 +519,10 @@

COMMANDS

  • Reachable object counts categorized by type

    -
    • - -

    The output format can be chosen through the flag --format. Three formats are supported:

    -
    -

    +

    -
    table
    @@ -551,9 +545,15 @@

    COMMANDS

    the delimiter between the key and value instead of =. Unlike the keyvalue format, values containing "unusual" characters are never quoted.

    +
    +

    -z is an alias for --format=nul.

    +
    + + + @@ -645,7 +645,7 @@

    GIT

    diff --git a/gitdatamodel.adoc b/gitdatamodel.adoc index 3614f5960..dcfdff034 100644 --- a/gitdatamodel.adoc +++ b/gitdatamodel.adoc @@ -235,8 +235,6 @@ there will no longer be a branch that points at the old commit. The old commit is recorded in the current branch's <>, so it is still "reachable", but when the reflog entry expires it may become unreachable and get deleted. - -the old commit will usually not be reachable, so it may be deleted eventually. Reachable objects will never be deleted. [[index]] diff --git a/gitdatamodel.html b/gitdatamodel.html index 4c5152712..7e6f3eec7 100644 --- a/gitdatamodel.html +++ b/gitdatamodel.html @@ -857,14 +857,11 @@

    REFERENCES

    The old commit is recorded in the current branch’s reflog, so it is still "reachable", but when the reflog entry expires it may become unreachable and get deleted. +Reachable objects will never be deleted. -
    -

    the old commit will usually not be reachable, so it may be deleted eventually. -Reachable objects will never be deleted.

    -
    @@ -986,7 +983,7 @@

    GIT