[pull] gh-pages from git:gh-pages

DecisionMaking.html

@@ -538,7 +538,7 @@ <h2 id="_other_discussion_venues">Other Discussion Venues</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-06-20 18:10:42 -0700
 </div>
 </div>
 </body>

MyFirstContribution.html

@@ -2256,7 +2256,7 @@ <h3 id="after-approval"><a class="anchor" href="#after-approval"></a>After Revie
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-05-27 15:29:51 -0700
+Last updated 2025-06-20 18:10:42 -0700
 </div>
 </div>
 </body>

RelNotes/2.51.0.adoc

@@ -64,6 +64,9 @@ UI, Workflows & Features
  * "git for-each-ref" learns "--start-after" option to help
    applications that want to page its output.
 
+ * "git switch" and "git restore" are declared to be no longer
+   experimental.
+
 
 Performance, Internal Implementation, Development Support etc.
 --------------------------------------------------------------
@@ -269,6 +272,18 @@ including security updates, are included in this release.
    few test helper programs are now closed.
    (merge 0f1b33815b hl/test-helper-fd-close later to maint).
 
+ * Interactive prompt code did not correctly strip CRLF from the end
+   of line on Windows.
+   (merge 711a20827b js/prompt-crlf-fix later to maint).
+
+ * The config API had a set of convenience wrapper functions that
+   implicitly use the_repository instance; they have been removed and
+   inlined at the calling sites.
+
+ * "git add/etc -p" now honor the diff.context configuration variable,
+   and also they learn to honor the -U<n> command-line option.
+   (merge 2b3ae04011 lm/add-p-context later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge b257adb571 lo/my-first-ow-doc-update later to maint).
    (merge 8b34b6a220 ly/sequencer-update-squash-is-fixup-only later to maint).
@@ -299,3 +314,9 @@ including security updates, are included in this release.
    (merge 26552cb62a jk/unleak-reflog-expire-entry later to maint).
    (merge 339d95fda9 jc/ci-print-test-failures-fix later to maint).
    (merge 8c3add51a8 cb/meson-avoid-broken-macos-pcre2 later to maint).
+   (merge 5247da07b8 ps/meson-clar-decls-fix later to maint).
+   (merge f3ef347bb2 ch/t7450-recursive-clone-test-fix later to maint).
+   (merge 4ac3302a1a jc/doc-release-vs-clear later to maint).
+   (merge 3bdd897413 ms/meson-with-ancient-git-wo-ls-files-dedup later to maint).
+   (merge cca758d324 kh/doc-fast-import-historical later to maint).
+   (merge 9b0781196a jc/test-hashmap-is-still-here later to maint).

ReviewingGuidelines.html

@@ -683,7 +683,7 @@ <h2 id="_see_also">See Also</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-06-20 18:10:42 -0700
 </div>
 </div>
 </body>

SubmittingPatches.html

@@ -1592,7 +1592,7 @@ <h3 id="_gnus">Gnus</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-07-24 21:55:32 -0700
+Last updated 2025-08-04 09:35:50 -0700
 </div>
 </div>
 </body>

ToolsForGit.html

@@ -520,7 +520,7 @@ <h4 id="_httpswww_kernel_orgdochtmlv4_10processcoding_style_htmlyou_ve_made_a_me
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-03-26 00:41:02 -0700
+Last updated 2025-06-20 18:10:42 -0700
 </div>
 </div>
 </body>

diff-context-options.adoc

@@ -0,0 +1,10 @@
+`-U<n>`::
+`--unified=<n>`::
+	Generate diffs with _<n>_ lines of context. Defaults to `diff.context`
+	or 3 if the config option is unset.
+
+`--inter-hunk-context=<n>`::
+	Show the context between diff hunks, up to the specified _<number>_
+	of lines, thereby fusing hunks that are close to each other.
+	Defaults to `diff.interHunkContext` or 0 if the config option
+	is unset.

everyday.html

@@ -457,7 +457,7 @@ <h1>Everyday Git With 20 Commands Or So</h1>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-06-20 18:10:42 -0700
 </div>
 </div>
 </body>

git-add.adoc

@@ -104,6 +104,8 @@ This effectively runs `add --interactive`, but bypasses the
 initial command menu and directly jumps to the `patch` subcommand.
 See ``Interactive mode'' for details.
 
+include::diff-context-options.adoc[]
+
 `-e`::
 `--edit`::
 	Open the diff vs. the index in an editor and let the user

git-add.html

@@ -570,6 +570,19 @@ <h2 id="_options">OPTIONS</h2>
 See &#8220;Interactive mode&#8221; for details.</p>
 </div>
 </dd>
+<dt class="hdlist1"><code>-U</code><em>&lt;n&gt;</em></dt>
+<dt class="hdlist1"><code>--unified=</code><em>&lt;n&gt;</em></dt>
+<dd>
+<p>Generate diffs with <em>&lt;n&gt;</em> lines of context. Defaults to <code>diff.context</code>
+or 3 if the config option is unset.</p>
+</dd>
+<dt class="hdlist1"><code>--inter-hunk-context=</code><em>&lt;n&gt;</em></dt>
+<dd>
+<p>Show the context between diff hunks, up to the specified <em>&lt;number&gt;</em>
+of lines, thereby fusing hunks that are close to each other.
+Defaults to <code>diff.interHunkContext</code> or 0 if the config option
+is unset.</p>
+</dd>
 <dt class="hdlist1"><code>-e</code></dt>
 <dt class="hdlist1"><code>--edit</code></dt>
 <dd>
@@ -1030,7 +1043,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-08-04 09:35:46 -0700
 </div>
 </div>
 </body>

git-am.html

@@ -869,7 +869,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-06-20 18:10:42 -0700
 </div>
 </div>
 </body>

git-archimport.html

@@ -591,7 +591,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-06-20 18:10:42 -0700
 </div>
 </div>
 </body>

git-archive.html

@@ -764,7 +764,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-06-20 18:10:42 -0700
 </div>
 </div>
 </body>

git-backfill.html

@@ -541,7 +541,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-02-18 15:42:55 -0800
+Last updated 2025-06-20 18:10:42 -0700
 </div>
 </div>
 </body>

git-bisect-lk2009.html

@@ -2133,7 +2133,7 @@ <h2 id="_references">References</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-06-20 18:10:42 -0700
 </div>
 </div>
 </body>

git-bisect.html

@@ -1091,7 +1091,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-03-26 00:41:02 -0700
+Last updated 2025-06-20 18:10:42 -0700
 </div>
 </div>
 </body>

git-bugreport.html

@@ -570,7 +570,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-06-20 18:10:42 -0700
 </div>
 </div>
 </body>

git-bundle.html

@@ -920,7 +920,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-06-20 18:10:42 -0700
 </div>
 </div>
 </body>

git-check-attr.html

@@ -642,7 +642,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-03-26 00:41:02 -0700
+Last updated 2025-06-20 18:10:42 -0700
 </div>
 </div>
 </body>

git-check-ignore.html

@@ -618,7 +618,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-06-20 18:10:42 -0700
 </div>
 </div>
 </body>

git-check-mailmap.html

@@ -532,7 +532,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-06-20 18:10:42 -0700
 </div>
 </div>
 </body>

git-check-ref-format.html

@@ -641,7 +641,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-06-20 18:10:42 -0700
 </div>
 </div>
 </body>

git-checkout-index.html

@@ -693,7 +693,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-06-20 18:10:42 -0700
 </div>
 </div>
 </body>

git-checkout.adoc

@@ -289,6 +289,8 @@ section of linkgit:git-add[1] to learn how to operate the `--patch` mode.
 Note that this option uses the no overlay mode by default (see also
 `--overlay`), and currently doesn't support overlay mode.
 
+include::diff-context-options.adoc[]
+
 `--ignore-other-worktrees`::
 	`git checkout` refuses when the wanted branch is already checked
 	out or otherwise in use by another worktree. This option makes

git-checkout.html

@@ -789,6 +789,19 @@ <h2 id="_options">OPTIONS</h2>
 <code>--overlay</code>), and currently doesn&#8217;t support overlay mode.</p>
 </div>
 </dd>
+<dt class="hdlist1"><code>-U</code><em>&lt;n&gt;</em></dt>
+<dt class="hdlist1"><code>--unified=</code><em>&lt;n&gt;</em></dt>
+<dd>
+<p>Generate diffs with <em>&lt;n&gt;</em> lines of context. Defaults to <code>diff.context</code>
+or 3 if the config option is unset.</p>
+</dd>
+<dt class="hdlist1"><code>--inter-hunk-context=</code><em>&lt;n&gt;</em></dt>
+<dd>
+<p>Show the context between diff hunks, up to the specified <em>&lt;number&gt;</em>
+of lines, thereby fusing hunks that are close to each other.
+Defaults to <code>diff.interHunkContext</code> or 0 if the config option
+is unset.</p>
+</dd>
 <dt class="hdlist1"><code>--ignore-other-worktrees</code></dt>
 <dd>
 <p><code>git</code> <code>checkout</code> refuses when the wanted branch is already checked
@@ -1289,7 +1302,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-06-02 12:42:06 -0700
+Last updated 2025-08-04 09:35:46 -0700
 </div>
 </div>
 </body>

git-cherry-pick.html

@@ -824,7 +824,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-06-20 18:10:42 -0700
 </div>
 </div>
 </body>

git-cherry.html

@@ -631,7 +631,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-06-20 18:10:42 -0700
 </div>
 </div>
 </body>

git-citool.html

@@ -482,7 +482,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-06-20 18:10:42 -0700
 </div>
 </div>
 </body>

git-clean.html

@@ -653,7 +653,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-06-20 18:10:42 -0700
 </div>
 </div>
 </body>

git-clone.html

@@ -1151,7 +1151,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-03-12 16:10:13 -0700
+Last updated 2025-06-20 18:10:42 -0700
 </div>
 </div>
 </body>

git-column.html

@@ -669,7 +669,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-06-03 09:25:29 -0700
+Last updated 2025-06-20 18:10:42 -0700
 </div>
 </div>
 </body>

git-commit-graph.html

@@ -717,7 +717,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-06-20 18:10:42 -0700
 </div>
 </div>
 </body>

git-commit-tree.html

@@ -729,7 +729,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-06-20 18:10:42 -0700
 </div>
 </div>
 </body>

git-commit.adoc

@@ -76,6 +76,8 @@ OPTIONS
 	which changes to commit. See linkgit:git-add[1] for
 	details.
 
+include::diff-context-options.adoc[]
+
 `-C <commit>`::
 `--reuse-message=<commit>`::
 	Take an existing _<commit>_ object, and reuse the log message