From 613334cb5a7643a40c588048c6fb84dddd3c287c Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 24 Feb 2023 11:54:38 -0800 Subject: Autogenerated HTML docs for v2.40.0-rc0 --- RelNotes/2.40.0.txt | 14 ++++++++++++++ SubmittingPatches.html | 2 +- git-log.html | 19 +++++-------------- git-rev-list.html | 19 +++++-------------- git-tools.html | 2 +- howto-index.html | 2 +- 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 +- rev-list-options.txt | 10 +++++----- technical/api-index.html | 2 +- 24 files changed, 49 insertions(+), 53 deletions(-) diff --git a/RelNotes/2.40.0.txt b/RelNotes/2.40.0.txt index 4232ad804..95c029adf 100644 --- a/RelNotes/2.40.0.txt +++ b/RelNotes/2.40.0.txt @@ -235,6 +235,19 @@ Fixes since v2.39 * Doc update. (merge d9ec3b0dc0 jk/doc-ls-remote-matching later to maint). + * Error messages given upon a signature verification failure used to + discard the errors from underlying gpg program, which has been + corrected. + (merge ad6b320756 js/gpg-errors later to maint). + + * Update --date=default documentation. + (merge 9deef088ae rd/doc-default-date-format later to maint). + + * A test helper had a single write(2) of 256kB, which was too big for + some platforms (e.g. NonStop), which has been corrected by using + xwrite() wrapper appropriately. + (merge 58eab6ff13 jc/genzeros-avoid-raw-write later to maint). + * Other code cleanup, docfix, build fix, etc. (merge 4eb1ccecd4 dh/mingw-ownership-check-typofix later to maint). (merge f95526419b ar/typofix-gitattributes-doc later to maint). @@ -261,3 +274,4 @@ Fixes since v2.39 (merge e65b868d07 rs/size-t-fixes later to maint). (merge 3eb1e1ca9a ab/config-h-remove-unused later to maint). (merge d390e08076 cw/doc-pushurl-vs-url later to maint). + (merge 567342fc77 rs/ctype-test later to maint). diff --git a/SubmittingPatches.html b/SubmittingPatches.html index ee0696649..f06bc84d3 100644 --- a/SubmittingPatches.html +++ b/SubmittingPatches.html @@ -1446,7 +1446,7 @@ this problem around.

diff --git a/git-log.html b/git-log.html index 58c9fefb4..05f764d72 100644 --- a/git-log.html +++ b/git-log.html @@ -2377,21 +2377,12 @@ Use --date=format:%c to show the date in your system locale’s preferred format. See the strftime manual for a complete list of format placeholders. When using -local, the correct syntax is --date=format-local:....

-

--date=default is the default format, and is similar to ---date=rfc2822, with a few exceptions:

+

--date=default is the default format, and is based on ctime(3) +output. It shows a single line with three-letter day of the week, +three-letter month, day-of-month, hour-minute-seconds in "HH:MM:SS" +format, followed by 4-digit year, plus timezone information, unless +the local time zone is used, e.g. Thu Jan 1 00:00:00 1970 +0000.

-
--parents diff --git a/git-rev-list.html b/git-rev-list.html index 68c72896e..c59de2209 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -2441,21 +2441,12 @@ Use --date=format:%c to show the date in your system locale’s preferred format. See the strftime manual for a complete list of format placeholders. When using -local, the correct syntax is --date=format-local:....

-

--date=default is the default format, and is similar to ---date=rfc2822, with a few exceptions:

+

--date=default is the default format, and is based on ctime(3) +output. It shows a single line with three-letter day of the week, +three-letter month, day-of-month, hour-minute-seconds in "HH:MM:SS" +format, followed by 4-digit year, plus timezone information, unless +the local time zone is used, e.g. Thu Jan 1 00:00:00 1970 +0000.

-
    -
  • -

    -there is no comma after the day-of-week -

    -
    • -
  • -

    -the time zone is omitted when the local time zone is used -

    -
    • -
--header diff --git a/git-tools.html b/git-tools.html index 2a55ada25..bedfaae59 100644 --- a/git-tools.html +++ b/git-tools.html @@ -752,7 +752,7 @@ more efficiently, so this manually-maintained list has been retired.

diff --git a/howto-index.html b/howto-index.html index 142f34162..ec0fcc8ae 100644 --- a/howto-index.html +++ b/howto-index.html @@ -895,7 +895,7 @@ later validate it.

diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html index c1ba79be3..273f3d566 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 9c76aa63c..c2b1c4ff0 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 38e74865e..18e5bf922 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 b908302a6..53e7049a2 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 738b00c46..1332ec3d9 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 fcb27a756..60121ecb1 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 afb25f3dc..31aae6f81 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 7c9774aa0..cd6fab3dd 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 64270e5ba..f64f9cc06 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 f8edee34b..f2fa30f7b 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 d77443156..a786250fb 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 7f5ceb379..566fb7e2f 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 dca3ec216..a83258900 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 7d20ffda3..4df55e88d 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 594d5ecaa..b52f4eea2 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 7eae6124b..684df14b1 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.

diff --git a/rev-list-options.txt b/rev-list-options.txt index ff68e4840..0d90d5b15 100644 --- a/rev-list-options.txt +++ b/rev-list-options.txt @@ -1100,12 +1100,12 @@ preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`. -`--date=default` is the default format, and is similar to -`--date=rfc2822`, with a few exceptions: +`--date=default` is the default format, and is based on ctime(3) +output. It shows a single line with three-letter day of the week, +three-letter month, day-of-month, hour-minute-seconds in "HH:MM:SS" +format, followed by 4-digit year, plus timezone information, unless +the local time zone is used, e.g. `Thu Jan 1 00:00:00 1970 +0000`. -- - - there is no comma after the day-of-week - - - the time zone is omitted when the local time zone is used ifdef::git-rev-list[] --header:: diff --git a/technical/api-index.html b/technical/api-index.html index 16c78917d..2629a269b 100644 --- a/technical/api-index.html +++ b/technical/api-index.html @@ -775,7 +775,7 @@ documents them.

-- cgit 1.2.3-korg