diff --git a/RelNotes/2.49.0.txt b/RelNotes/2.49.0.txt
index dbdec19a6..26fe1a0b1 100644
--- a/RelNotes/2.49.0.txt
+++ b/RelNotes/2.49.0.txt
@@ -4,6 +4,8 @@ Git v2.49 Release Notes
UI, Workflows & Features
------------------------
+ * Completion script updates for zsh
+
Performance, Internal Implementation, Development Support etc.
--------------------------------------------------------------
@@ -12,6 +14,13 @@ Performance, Internal Implementation, Development Support etc.
* meson-based build now supports the unsafe-sha1 build knob.
+ * The code to check LSan results has been simplified and made more
+ robust.
+ (merge 164a2516eb jk/lsan-race-ignore-false-positive later to maint).
+
+ * More code paths have a repository passed through the callchain,
+ instead of assuming the primary the_repository object.
+
Fixes since v2.48
-----------------
@@ -30,4 +39,17 @@ Fixes since v2.48
to.
(merge d7fcbe2c56 ps/object-collision-check later to maint).
+ * The code to compute "unique" name used git_rand() which can fail or
+ get stuck; the callsite does not require cryptographic security.
+ Introduce the "insecure" mode and use it appropriately.
+ (merge 0b4f8afef6 ps/reftable-get-random-fix later to maint).
+
+ * A misconfigured "fsck.skiplist" configuration variable was not
+ diagnosed as an error, which has been corrected.
+ (merge ca7158076f jt/fsck-skiplist-parse-fix later to maint).
+
* Other code cleanup, docfix, build fix, etc.
+ (merge ddb5287894 jk/t7407-use-test-grep later to maint).
+ (merge 21e1b44865 aj/difftool-config-doc-fix later to maint).
+ (merge 6a63995335 mh/gitattr-doc-markup-fix later to maint).
+ (merge 43850dcf9c sk/unit-test-hash later to maint).
diff --git a/git-config.html b/git-config.html
index f671642e2..bfa8d93e2 100644
--- a/git-config.html
+++ b/git-config.html
@@ -4196,6 +4196,83 @@ Variables
Set this option to true to make the diff driver cache the text
conversion outputs. See gitattributes(5) for details.
+
+diff.indentHeuristic
+
+Set this option to false to disable the default heuristics
+that shift diff hunk boundaries to make patches easier to read.
+
+diff.algorithm
+
+Choose a diff algorithm. The variants are as follows:
+
+
+
+
+defaultmyers-
+
The basic greedy diff algorithm. Currently, this is the default.
+
+minimal-
+
Spend extra time to make sure the smallest possible diff is
+produced.
+
+patience-
+
Use "patience diff" algorithm when generating patches.
+
+histogram-
+
This algorithm extends the patience algorithm to "support
+low-occurrence common elements".
+
+
+
+
+
diff.wsErrorHighlight
+
+Highlight whitespace errors in the context, old or new
+lines of the diff. Multiple values are separated by comma,
+none resets previous values, default reset the list to
+new and all is a shorthand for old,new,context. The
+whitespace errors are colored with color.diff.whitespace.
+The command line option --ws-error-highlight=<kind>
+overrides this setting.
+
+diff.colorMoved
+
+If set to either a valid <mode> or a true value, moved lines
+in a diff are colored differently.
+For details of valid modes see --color-moved in git-diff(1).
+If simply set to true the default color mode will be used. When
+set to false, moved lines are not colored.
+
+diff.colorMovedWS
+
+When moved lines are colored using e.g. the diff.colorMoved setting,
+this option controls the mode how spaces are treated.
+For details of valid modes see --color-moved-ws in git-diff(1).
+
+diff.tool
+
+Controls which diff tool is used by git-difftool(1).
+This variable overrides the value configured in merge.tool.
+The list below shows the valid built-in values.
+Any other value is treated as a custom diff tool and requires
+that a corresponding difftool.<tool>.cmd variable is defined.
+
+diff.guitool
+
+Controls which diff tool is used by git-difftool(1) when
+the -g/--gui flag is specified. This variable overrides the value
+configured in merge.guitool. The list below shows the valid
+built-in values. Any other value is treated as a custom diff tool
+and requires that a corresponding difftool.<guitool>.cmd variable
+is defined.
araxisVariables
-diff.indentHeuristic
-
-Set this option to false to disable the default heuristics
-that shift diff hunk boundaries to make patches easier to read.
-
-diff.algorithm
-
-Choose a diff algorithm. The variants are as follows:
-
-
-
-
-defaultmyers-
-
The basic greedy diff algorithm. Currently, this is the default.
-
-minimal-
-
Spend extra time to make sure the smallest possible diff is
-produced.
-
-patience-
-
Use "patience diff" algorithm when generating patches.
-
-histogram-
-
This algorithm extends the patience algorithm to "support
-low-occurrence common elements".
-
-
-
-
-
diff.wsErrorHighlight
-
-Highlight whitespace errors in the context, old or new
-lines of the diff. Multiple values are separated by comma,
-none resets previous values, default reset the list to
-new and all is a shorthand for old,new,context. The
-whitespace errors are colored with color.diff.whitespace.
-The command line option --ws-error-highlight=<kind>
-overrides this setting.
-
-diff.colorMoved
-
-If set to either a valid <mode> or a true value, moved lines
-in a diff are colored differently.
-For details of valid modes see --color-moved in git-diff(1).
-If simply set to true the default color mode will be used. When
-set to false, moved lines are not colored.
-
-diff.colorMovedWS
-
-When moved lines are colored using e.g. the diff.colorMoved setting,
-this option controls the mode how spaces are treated.
-For details of valid modes see --color-moved-ws in git-diff(1).
-
-diff.tool
-
-Controls which diff tool is used by git-difftool(1).
-This variable overrides the value configured in merge.tool.
-The list below shows the valid built-in values.
-Any other value is treated as a custom diff tool and requires
-that a corresponding difftool.<tool>.cmd variable is defined.
-
-diff.guitool
-
-Controls which diff tool is used by git-difftool(1) when
-the -g/--gui flag is specified. This variable overrides the value
-configured in merge.guitool. The list below shows the valid
-built-in values. Any other value is treated as a custom diff tool
-and requires that a corresponding difftool.<guitool>.cmd variable
-is defined.
-
difftool.<tool>.cmd
Specify the command to invoke the specified diff tool.
diff --git a/git-diff.html b/git-diff.html
index 5e573d6e3..6c4cb451b 100644
--- a/git-diff.html
+++ b/git-diff.html
@@ -2549,110 +2549,6 @@
CONFIGURATION
Set this option to true to make the diff driver cache the text
conversion outputs. See gitattributes(5) for details.
-
-
-araxis-
-
Use Araxis Merge (requires a graphical session)
-
-bc-
-
Use Beyond Compare (requires a graphical session)
-
-bc3-
-
Use Beyond Compare (requires a graphical session)
-
-bc4-
-
Use Beyond Compare (requires a graphical session)
-
-codecompare-
-
Use Code Compare (requires a graphical session)
-
-deltawalker-
-
Use DeltaWalker (requires a graphical session)
-
-diffmerge-
-
Use DiffMerge (requires a graphical session)
-
-diffuse-
-
Use Diffuse (requires a graphical session)
-
-ecmerge-
-
Use ECMerge (requires a graphical session)
-
-emerge-
-
Use Emacs' Emerge
-
-examdiff-
-
Use ExamDiff Pro (requires a graphical session)
-
-guiffy-
-
Use Guiffy’s Diff Tool (requires a graphical session)
-
-gvimdiff-
-
Use gVim (requires a graphical session)
-
-kdiff3-
-
Use KDiff3 (requires a graphical session)
-
-kompare-
-
Use Kompare (requires a graphical session)
-
-meld-
-
Use Meld (requires a graphical session)
-
-nvimdiff-
-
Use Neovim
-
-opendiff-
-
Use FileMerge (requires a graphical session)
-
-p4merge-
-
Use HelixCore P4Merge (requires a graphical session)
-
-smerge-
-
Use Sublime Merge (requires a graphical session)
-
-tkdiff-
-
Use TkDiff (requires a graphical session)
-
-vimdiff-
-
Use Vim
-
-vscode-
-
Use Visual Studio Code (requires a graphical session)
-
-winmerge-
-
Use WinMerge (requires a graphical session)
-
-xxdiff-
-
Use xxdiff (requires a graphical session)
-
-
-
diff.indentHeuristic
diff --git a/git-difftool.html b/git-difftool.html
index 26cfe3ddb..7a620bd18 100644
--- a/git-difftool.html
+++ b/git-difftool.html
@@ -618,6 +618,110 @@ CONFIGURATION
built-in values. Any other value is treated as a custom diff tool
and requires that a corresponding difftool.<guitool>.cmd variable
is defined.
+
+
+araxis-
+
Use Araxis Merge (requires a graphical session)
+
+bc-
+
Use Beyond Compare (requires a graphical session)
+
+bc3-
+
Use Beyond Compare (requires a graphical session)
+
+bc4-
+
Use Beyond Compare (requires a graphical session)
+
+codecompare-
+
Use Code Compare (requires a graphical session)
+
+deltawalker-
+
Use DeltaWalker (requires a graphical session)
+
+diffmerge-
+
Use DiffMerge (requires a graphical session)
+
+diffuse-
+
Use Diffuse (requires a graphical session)
+
+ecmerge-
+
Use ECMerge (requires a graphical session)
+
+emerge-
+
Use Emacs' Emerge
+
+examdiff-
+
Use ExamDiff Pro (requires a graphical session)
+
+guiffy-
+
Use Guiffy’s Diff Tool (requires a graphical session)
+
+gvimdiff-
+
Use gVim (requires a graphical session)
+
+kdiff3-
+
Use KDiff3 (requires a graphical session)
+
+kompare-
+
Use Kompare (requires a graphical session)
+
+meld-
+
Use Meld (requires a graphical session)
+
+nvimdiff-
+
Use Neovim
+
+opendiff-
+
Use FileMerge (requires a graphical session)
+
+p4merge-
+
Use HelixCore P4Merge (requires a graphical session)
+
+smerge-
+
Use Sublime Merge (requires a graphical session)
+
+tkdiff-
+
Use TkDiff (requires a graphical session)
+
+vimdiff-
+
Use Vim
+
+vscode-
+
Use Visual Studio Code (requires a graphical session)
+
+winmerge-
+
Use WinMerge (requires a graphical session)
+
+xxdiff-
+
Use xxdiff (requires a graphical session)
+
+
+
Defining a custom merge driver
The merge driver can learn the pathname in which the merged result
will be stored via placeholder %P. The conflict labels to be used
for the common ancestor, local head and other head can be passed by
-using %S, %X and '%Y` respectively.
+using %S, %X and %Y respectively.
@@ -2124,7 +2124,7 @@
GIT
diff --git a/gitattributes.txt b/gitattributes.txt
index e6150595a..5d12b7854 100644
--- a/gitattributes.txt
+++ b/gitattributes.txt
@@ -1166,7 +1166,7 @@ internal merge and the final merge.
The merge driver can learn the pathname in which the merged result
will be stored via placeholder `%P`. The conflict labels to be used
for the common ancestor, local head and other head can be passed by
-using '%S', '%X' and '%Y` respectively.
+using `%S`, `%X` and `%Y` respectively.
`conflict-marker-size`
^^^^^^^^^^^^^^^^^^^^^^