From 3acb2e7b34954a141e76b0004a474d276bc86657 Mon Sep 17 00:00:00 2001
From: Junio C Hamano
Date: Tue, 4 Apr 2023 16:19:06 -0700
Subject: Autogenerated HTML docs for v2.40.0-214-gae73b
---
RelNotes/2.41.0.txt | 24 +++++++++++++++++
blame-options.txt | 10 ++++----
git-annotate.html | 10 ++++----
git-blame.html | 14 +++++-----
git-blame.txt | 2 +-
git-config.html | 15 +++++++++++
git-rebase.html | 40 ++++++++++++++++++++++-------
git-rebase.txt | 19 +++++++++-----
git-rev-list.html | 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 +-
rev-list-options.txt | 9 +++++--
26 files changed, 130 insertions(+), 54 deletions(-)
diff --git a/RelNotes/2.41.0.txt b/RelNotes/2.41.0.txt
index fa2cb4b45..1e9b6a66e 100644
--- a/RelNotes/2.41.0.txt
+++ b/RelNotes/2.41.0.txt
@@ -38,6 +38,13 @@ UI, Workflows & Features
* Lift the limitation that colored prompts can only be used with
PROMPT_COMMAND mode.
+ * "git blame --contents= -- " used to be forbidden,
+ but now it finds the origins of lines starting at contents
+ through the history that leads to .
+
+ * "git pack-redundant" gave a warning when run, as the command has
+ outlived its usefulness long ago and is nominated for future
+ removal. Now we escalate to give an error.
Performance, Internal Implementation, Development Support etc.
@@ -135,6 +142,19 @@ Fixes since v2.40
been disabled to work around the bug.
(merge 14b9a04479 mk/workaround-pcre-jit-ucp-bug later to maint).
+ * The wildmatch library code unlearns exponential behaviour it
+ acquired some time ago since it was borrowed from rsync.
+ (merge 3dc0b7f0dc pw/wildmatch-fixes later to maint).
+
+ * The index files can become corrupt under certain conditions when
+ the split-index feature is in use, especially together with
+ fsmonitor, which have been corrected.
+ (merge 061dd722dc js/split-index-fixes later to maint).
+
+ * Document what the pathname-looking strings in "rev-list --object"
+ output are for and what they mean.
+ (merge 15364d2a3c jk/document-rev-list-object-name later to maint).
+
* Other code cleanup, docfix, build fix, etc.
(merge f7111175df as/doc-markup-fix later to maint).
(merge 90ff7c9898 fc/test-aggregation-clean-up later to maint).
@@ -143,3 +163,7 @@ Fixes since v2.40
(merge 3457b50e8c ab/retire-scripted-add-p later to maint).
(merge d52fcf493b ds/p2000-fix-grep-sparse later to maint).
(merge ec063d2591 ss/hashmap-typofix later to maint).
+ (merge 1aaed69d11 rs/archive-mtime later to maint).
+ (merge 2da2cc9b28 ob/rollback-after-commit-lock-failure later to maint).
+ (merge 54dbd0933b ob/sequencer-save-head-simplify later to maint).
+ (merge a93cbe8d78 ar/test-cleanup-unused-file-creation later to maint).
diff --git a/blame-options.txt b/blame-options.txt
index 9a663535f..95599bd6e 100644
--- a/blame-options.txt
+++ b/blame-options.txt
@@ -64,11 +64,11 @@ include::line-range-format.txt[]
manual page.
--contents ::
- When is not specified, the command annotates the
- changes starting backwards from the working tree copy.
- This flag makes the command pretend as if the working
- tree copy has the contents of the named file (specify
- `-` to make the command read from the standard input).
+ Pretend the file being annotated has a commit with the
+ contents from the named file and a parent of ,
+ defaulting to HEAD when no is specified. You may
+ specify '-' to make the command read from the standard
+ input for the file contents.
--date ::
Specifies the format used to output dates. If --date is not
diff --git a/git-annotate.html b/git-annotate.html
index 054cf1170..3f82bf6f7 100644
--- a/git-annotate.html
+++ b/git-annotate.html
@@ -941,11 +941,11 @@ in gitattributes(5)).
- When <rev> is not specified, the command annotates the
- changes starting backwards from the working tree copy.
- This flag makes the command pretend as if the working
- tree copy has the contents of the named file (specify
- -
to make the command read from the standard input).
+ Pretend the file being annotated has a commit with the
+ contents from the named file and a parent of <rev>,
+ defaulting to HEAD when no <rev> is specified. You may
+ specify - to make the command read from the standard
+ input for the file contents.
diff --git a/git-blame.html b/git-blame.html
index cb1eca644..1cd7bfbf4 100644
--- a/git-blame.html
+++ b/git-blame.html
@@ -753,7 +753,7 @@ git-blame(1) Manual Page
[-L <range>] [-S <revs-file>] [-M] [-C] [-C] [-C] [--since=<date>]
[--ignore-rev <rev>] [--ignore-revs-file <file>]
[--color-lines] [--color-by-age] [--progress] [--abbrev=<n>]
- [<rev> | --contents <file> | --reverse <rev>..<rev>] [--] <file>
+ [ --contents <file> ] [<rev> | --reverse <rev>..<rev>] [--] <file>
@@ -963,11 +963,11 @@ in gitattributes(5)).
- When <rev> is not specified, the command annotates the
- changes starting backwards from the working tree copy.
- This flag makes the command pretend as if the working
- tree copy has the contents of the named file (specify
- -
to make the command read from the standard input).
+ Pretend the file being annotated has a commit with the
+ contents from the named file and a parent of <rev>,
+ defaulting to HEAD when no <rev> is specified. You may
+ specify - to make the command read from the standard
+ input for the file contents.
@@ -1500,7 +1500,7 @@ blame.markIgnoredLines