From c2ce68948000710bfac0e3999df05eda7a465977 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 23 Jan 2023 14:34:56 -0800 Subject: Autogenerated HTML docs for v2.39.1-348-g5dec9 --- RelNotes/2.40.0.txt | 24 ++++++++++++++++++++++++ git-check-attr.html | 16 +++++++++++++--- git-check-attr.txt | 9 +++++++-- howto/coordinate-embargoed-releases.html | 2 +- howto/keep-canonical-history-correct.html | 2 +- howto/maintain-git.html | 2 +- howto/new-command.html | 2 +- howto/rebase-from-internal-branch.html | 2 +- howto/rebuild-from-update-hook.html | 2 +- howto/recover-corrupted-blob-object.html | 2 +- howto/recover-corrupted-object-harder.html | 2 +- howto/revert-a-faulty-merge.html | 2 +- howto/revert-branch-rebase.html | 2 +- howto/separating-topic-branches.html | 2 +- howto/setup-git-server-over-http.html | 2 +- howto/update-hook-example.html | 2 +- howto/use-git-daemon.html | 2 +- howto/using-merge-subtree.html | 2 +- howto/using-signed-tag-in-pull-request.html | 2 +- 19 files changed, 60 insertions(+), 21 deletions(-) diff --git a/RelNotes/2.40.0.txt b/RelNotes/2.40.0.txt index 629d3c698..df729641e 100644 --- a/RelNotes/2.40.0.txt +++ b/RelNotes/2.40.0.txt @@ -35,6 +35,11 @@ UI, Workflows & Features * Introduce an optional configuration to allow the trailing hash that protects the index file from bit flipping. + * "git check-attr" learned to take an optional tree-ish to read the + .gitattributes file from. + + * "scalar" learned to give progress bar. + Performance, Internal Implementation, Development Support etc. @@ -150,6 +155,23 @@ Fixes since v2.39 * Document ORIG_HEAD a bit more. (merge f1c9243fc5 pb/doc-orig-head later to maint). + * "git ls-tree --format='%(path) %(path)' $tree $path" showed the + path three times, which has been corrected. + (merge c388fcda99 rs/ls-tree-path-expansion-fix later to maint). + + * Remove "git env--helper" and demote it to a test-tool subcommand. + (merge 4a1baacd46 ab/test-env-helper later to maint). + + * Newer regex library macOS stopped enabling GNU-like enhanced BRE, + where '\(A\|B\)' works as alternation, unless explicitly asked with + the REG_ENHANCED flag. "git grep" now can be compiled to do so, to + retain the old behaviour. + (merge 54463d32ef rs/use-enhanced-bre-on-macos later to maint). + + * Pthread emulation on Win32 leaked thread handle when a thread is + joined. + (merge 238a9dfe86 sk/win32-close-handle-upon-pthread-join later to maint). + * Other code cleanup, docfix, build fix, etc. (merge 77e04b2ed4 rs/t4205-do-not-exit-in-test-script later to maint). (merge faebba436e rs/plug-pattern-list-leak-in-lof later to maint). @@ -177,3 +199,5 @@ Fixes since v2.39 (merge f5156f1885 ar/bisect-doc-update later to maint). (merge fca2d86c97 jk/interop-error later to maint). (merge cf4936ed74 tl/ls-tree-code-clean-up later to maint). + (merge dcb47e52b0 en/t6426-todo-cleanup later to maint). + (merge 5b8db44bdd jc/format-patch-v-unleak later to maint). diff --git a/git-check-attr.html b/git-check-attr.html index 5859d6cb1..6dc9cb7ea 100644 --- a/git-check-attr.html +++ b/git-check-attr.html @@ -749,8 +749,8 @@ git-check-attr(1) Manual Page

SYNOPSIS

-
git check-attr [-a | --all | <attr>…] [--] <pathname>…
-git check-attr --stdin [-z] [-a | --all | <attr>…]
+
git check-attr [--source <tree-ish>] [-a | --all | <attr>…] [--] <pathname>…
+git check-attr --stdin [-z] [--source <tree-ish>] [-a | --all | <attr>…]
@@ -804,6 +804,16 @@ git-check-attr(1) Manual Page

+--source=<tree-ish> +
+
+

+ Check attributes against the specified tree-ish. It is common to + specify the source tree by naming a commit, branch or tag associated + with it. +

+
+
--
@@ -960,7 +970,7 @@ README: caveat: unspecified diff --git a/git-check-attr.txt b/git-check-attr.txt index 84f41a8e8..6e4f3aaf3 100644 --- a/git-check-attr.txt +++ b/git-check-attr.txt @@ -9,8 +9,8 @@ git-check-attr - Display gitattributes information SYNOPSIS -------- [verse] -'git check-attr' [-a | --all | ...] [--] ... -'git check-attr' --stdin [-z] [-a | --all | ...] +'git check-attr' [--source ] [-a | --all | ...] [--] ... +'git check-attr' --stdin [-z] [--source ] [-a | --all | ...] DESCRIPTION ----------- @@ -36,6 +36,11 @@ OPTIONS If `--stdin` is also given, input paths are separated with a NUL character instead of a linefeed character. +--source=:: + Check attributes against the specified tree-ish. It is common to + specify the source tree by naming a commit, branch or tag associated + with it. + \--:: Interpret all preceding arguments as attributes and all following arguments as path names. diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html index 6098ef20e..546568f01 100644 --- a/howto/coordinate-embargoed-releases.html +++ b/howto/coordinate-embargoed-releases.html @@ -1038,7 +1038,7 @@ Thanks, diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html index 7112a41b8..df186f191 100644 --- a/howto/keep-canonical-history-correct.html +++ b/howto/keep-canonical-history-correct.html @@ -938,7 +938,7 @@ tip of your master again and redo the two merges:

diff --git a/howto/maintain-git.html b/howto/maintain-git.html index 10227b5dd..1c0371677 100644 --- a/howto/maintain-git.html +++ b/howto/maintain-git.html @@ -1478,7 +1478,7 @@ $ git update-ref -d $mf/ai/topic diff --git a/howto/new-command.html b/howto/new-command.html index 6327495d1..435f2409b 100644 --- a/howto/new-command.html +++ b/howto/new-command.html @@ -863,7 +863,7 @@ letter [PATCH 0/n]. diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html index 034403e3b..e9310d941 100644 --- a/howto/rebase-from-internal-branch.html +++ b/howto/rebase-from-internal-branch.html @@ -895,7 +895,7 @@ the #1' commit.

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html index 36cca9822..13a70637d 100644 --- a/howto/rebuild-from-update-hook.html +++ b/howto/rebuild-from-update-hook.html @@ -847,7 +847,7 @@ This is still crude and does not protect against simultaneous diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html index 0ec0ffa85..956d8b1bf 100644 --- a/howto/recover-corrupted-blob-object.html +++ b/howto/recover-corrupted-blob-object.html @@ -880,7 +880,7 @@ thing.

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html index acc6c1dd2..2659531c4 100644 --- a/howto/recover-corrupted-object-harder.html +++ b/howto/recover-corrupted-object-harder.html @@ -1189,7 +1189,7 @@ int main(int argc, char **argv) diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html index 4079223b0..58723c827 100644 --- a/howto/revert-a-faulty-merge.html +++ b/howto/revert-a-faulty-merge.html @@ -1025,7 +1025,7 @@ P---o---o---M---x---x---W---x---M2 diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index 7eebbc377..128cefae3 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html @@ -907,7 +907,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html index 1be87e2c5..f6496c3fb 100644 --- a/howto/separating-topic-branches.html +++ b/howto/separating-topic-branches.html @@ -841,7 +841,7 @@ o---o"master" diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html index c5055b808..b70a209f9 100644 --- a/howto/setup-git-server-over-http.html +++ b/howto/setup-git-server-over-http.html @@ -1071,7 +1071,7 @@ help diagnosing the problem, but removes security checks.

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html index cf5a8dfc9..f939b5f2c 100644 --- a/howto/update-hook-example.html +++ b/howto/update-hook-example.html @@ -930,7 +930,7 @@ that JC can make non-fast-forward pushes on it.

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html index 201654b04..532babef8 100644 --- a/howto/use-git-daemon.html +++ b/howto/use-git-daemon.html @@ -791,7 +791,7 @@ a good practice to put the paths after a "--" separator.

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html index 665ff19d1..619e750d5 100644 --- a/howto/using-merge-subtree.html +++ b/howto/using-merge-subtree.html @@ -848,7 +848,7 @@ Please note that if the other project merges from you, then it will diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html index 1570a705e..1df8f9540 100644 --- a/howto/using-signed-tag-in-pull-request.html +++ b/howto/using-signed-tag-in-pull-request.html @@ -952,7 +952,7 @@ as part of the merge commit.

-- cgit 1.2.3-korg