Autogenerated HTML docs for v2.42.0-526-g3130c1

git · Oct 29, 2023 · 918a697 · 918a697
1 parent 33be821
commit 918a697
Show file tree

Hide file tree

Showing 253 changed files with 373 additions and 343 deletions.
diff --git a/MyFirstContribution.html b/MyFirstContribution.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>My First Contribution to the Git Project</h1>
-<span id="revdate">2023-10-23</span>
+<span id="revdate">2023-10-29</span>
 </div>
 <div id="content">
 <div class="sect1">
@@ -2096,7 +2096,7 @@ <h3 id="after-approval">After Review Approval</h3>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-08-04 12:03:14 PDT
+ 2023-08-05 04:03:14 JST
 </div>
 </div>
 </body>

diff --git a/MyFirstObjectWalk.html b/MyFirstObjectWalk.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>My First Object Walk</h1>
-<span id="revdate">2023-10-23</span>
+<span id="revdate">2023-10-29</span>
 </div>
 <div id="content">
 <div class="sect1">
@@ -1737,7 +1737,7 @@ <h2 id="_wrapping_up">Wrapping Up</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-07-17 11:51:48 PDT
+ 2023-07-18 03:51:48 JST
 </div>
 </div>
 </body>

diff --git a/RelNotes/2.43.0.txt b/RelNotes/2.43.0.txt
@@ -95,6 +95,9 @@ UI, Workflows & Features
  * "git log" and friends learned "--dd" that is a short-hand for
    "--diff-merges=first-parent -p".
 
+ * The attribute subsystem learned to honor `attr.tree` configuration
+   that specifies which tree to read the .gitattributes files from.
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -278,6 +281,15 @@ Fixes since v2.42
    storing a bogus sd_size value instead for such files.
    (merge 5143ac07b1 bc/racy-4gb-files later to maint).
 
+ * "git p4" tried to store symlinks to LFS when told, but has been
+   fixed not to do so, because it does not make sense.
+   (merge 10c89a02b0 mm/p4-symlink-with-lfs later to maint).
+
+ * The codepath to handle recipient addresses `git send-email
+   --compose` learns from the user was completely broken, which has
+   been corrected.
+   (merge 3ec6167567 jk/send-email-fix-addresses-from-composed-messages later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge fd3ba590d8 ws/git-push-doc-grammofix later to maint).
    (merge 5f33a843de ds/upload-pack-error-sequence-fix later to maint).
@@ -303,3 +315,10 @@ Fixes since v2.42
    (merge badf2fe1c3 jk/decoration-and-other-leak-fixes later to maint).
    (merge cebfaaa333 sn/cat-file-doc-update later to maint).
    (merge 8b3aa36f5a ps/rewritten-is-per-worktree-doc later to maint).
+   (merge ffbf6a748d jc/update-list-references-to-lore later to maint).
+   (merge 14d569b1a7 jc/am-doc-whitespace-action-fix later to maint).
+   (merge 48399e9cf0 ni/die-message-fix-for-git-add later to maint).
+   (merge ca3285dd69 ps/git-repack-doc-fixes later to maint).
+   (merge 243c79fdc7 wx/merge-ort-comment-typofix later to maint).
+   (merge a060705d94 jc/commit-new-underscore-index-fix later to maint).
+   (merge f6d83e2115 ms/doc-push-fix later to maint).
diff --git a/ReviewingGuidelines.html b/ReviewingGuidelines.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>Reviewing Patches in the Git Project</h1>
-<span id="revdate">2023-10-23</span>
+<span id="revdate">2023-10-29</span>
 </div>
 <div id="content">
 <div class="sect1">
@@ -975,7 +975,7 @@ <h2 id="_see_also">See Also</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-10-23 14:43:46 PDT
+ 2023-10-24 06:43:46 JST
 </div>
 </div>
 </body>

diff --git a/SubmittingPatches.html b/SubmittingPatches.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>Submitting Patches</h1>
-<span id="revdate">2023-10-23</span>
+<span id="revdate">2023-10-29</span>
 </div>
 <div id="content">
 <div class="sect1">
@@ -1179,8 +1179,8 @@ <h3 id="send-patches">Sending your patches.</h3>
 mailing list<span class="footnote" id="_footnote_security-ml"><br />[The Git Security mailing list: <a href="mailto:[email protected]">[email protected]</a>]<br /></span>, instead of the public mailing list.</p></div>
 <div class="paragraph"><p>Learn to use format-patch and send-email if possible.  These commands
 are optimized for the workflow of sending patches, avoiding many ways
-your existing e-mail client that is optimized for "multipart/*" mime
-type e-mails to corrupt and render your patches unusable.</p></div>
+your existing e-mail client (often optimized for "multipart/*" MIME
+type e-mails) might render your patches unusable.</p></div>
 <div class="paragraph"><p>People on the Git mailing list need to be able to read and
 comment on the changes you are submitting.  It is important for
 a developer to be able to "quote" your changes, using standard
@@ -1300,8 +1300,8 @@ <h2 id="_subsystems_with_dedicated_maintainers">Subsystems with dedicated mainta
 </div></div>
 <div class="literalblock">
 <div class="content">
-<pre><code>Those who are interested in improve gitk can volunteer to help Paul
-in maintaining it cf. &lt;YntxL/fTplFm8lr6@cleo&gt;.</code></pre>
+<pre><code>Those who are interested in improving gitk can volunteer to help Paul
+maintain it, cf. &lt;YntxL/fTplFm8lr6@cleo&gt;.</code></pre>
 </div></div>
 </li>
 <li>
@@ -1367,7 +1367,7 @@ <h2 id="patch-flow">An ideal patch flow</h2>
 </ol></div>
 <div class="paragraph"><p>In any time between the (2)-(3) cycle, the maintainer may pick it up
 from the list and queue it to <code>seen</code>, in order to make it easier for
-people play with it without having to pick up and apply the patch to
+people to play with it without having to pick up and apply the patch to
 their trees themselves.</p></div>
 </div>
 </div>
@@ -1518,7 +1518,7 @@ <h3 id="_gnus">Gnus</h3>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-10-23 14:43:47 PDT
+ 2023-10-30 08:42:01 JST
 </div>
 </div>
 </body>

diff --git a/SubmittingPatches.txt b/SubmittingPatches.txt
@@ -393,8 +393,8 @@ mailing list{security-ml}, instead of the public mailing list.
 
 Learn to use format-patch and send-email if possible.  These commands
 are optimized for the workflow of sending patches, avoiding many ways
-your existing e-mail client that is optimized for "multipart/*" mime
-type e-mails to corrupt and render your patches unusable.
+your existing e-mail client (often optimized for "multipart/*" MIME
+type e-mails) might render your patches unusable.
 
 People on the Git mailing list need to be able to read and
 comment on the changes you are submitting.  It is important for
@@ -515,8 +515,8 @@ repositories.
 
 	git://git.ozlabs.org/~paulus/gitk
 
-   Those who are interested in improve gitk can volunteer to help Paul
-   in maintaining it cf. <YntxL/fTplFm8lr6@cleo>.
+   Those who are interested in improving gitk can volunteer to help Paul
+   maintain it, cf. <YntxL/fTplFm8lr6@cleo>.
 
 - `po/` comes from the localization coordinator, Jiang Xin:
 
@@ -556,7 +556,7 @@ help you find out who they are.
 
 In any time between the (2)-(3) cycle, the maintainer may pick it up
 from the list and queue it to `seen`, in order to make it easier for
-people play with it without having to pick up and apply the patch to
+people to play with it without having to pick up and apply the patch to
 their trees themselves.
 
 [[patch-status]]

diff --git a/ToolsForGit.html b/ToolsForGit.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>Tools for developing Git</h1>
-<span id="revdate">2023-10-23</span>
+<span id="revdate">2023-10-29</span>
 </div>
 <div id="content">
 <div class="sect1">
@@ -806,7 +806,7 @@ <h4 id="_a_href_https_www_kernel_org_doc_html_v4_10_process_coding_style_html_yo
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-10-23 14:43:46 PDT
+ 2023-10-24 06:43:46 JST
 </div>
 </div>
 </body>

diff --git a/config.txt b/config.txt
@@ -371,6 +371,8 @@ other popular tools, and describe them in your documentation.
 
 include::config/advice.txt[]
 
+include::config/attr.txt[]
+
 include::config/core.txt[]
 
 include::config/add.txt[]

diff --git a/diff-options.txt b/diff-options.txt
@@ -76,7 +76,7 @@ off, none::
 +
 on, m::
 	Make diff output for merge commits to be shown in the default
-	format. The default format could be changed using
+	format. The default format can be changed using
 	`log.diffMerges` configuration variable, whose default value
 	is `separate`.
 +
@@ -314,7 +314,7 @@ ifndef::git-format-patch[]
 
 -z::
 ifdef::git-log[]
-	Separate the commits with NULs instead of with new newlines.
+	Separate the commits with NULs instead of newlines.
 +
 Also, when `--raw` or `--numstat` has been given, do not munge
 pathnames and use NULs as output field terminators.

diff --git a/everyday.html b/everyday.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>Everyday Git With 20 Commands Or So</h1>
-<span id="revdate">2023-10-23</span>
+<span id="revdate">2023-10-29</span>
 </div>
 <div id="content">
 <div id="preamble">
@@ -751,7 +751,7 @@ <h1>Everyday Git With 20 Commands Or So</h1>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2020-03-10 15:02:33 PDT
+ 2020-03-11 07:02:33 JST
 </div>
 </div>
 </body>

diff --git a/git-add.html b/git-add.html
@@ -1425,7 +1425,7 @@ <h2 id="_git">GIT</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-02-22 15:29:29 PST
+ 2023-02-23 08:29:29 JST
 </div>
 </div>
 </body>

diff --git a/git-am.html b/git-am.html
@@ -752,7 +752,7 @@ <h2 id="_synopsis">SYNOPSIS</h2>
 <pre class="content"><em>git am</em> [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8] [--no-verify]
          [--[no-]3way] [--interactive] [--committer-date-is-author-date]
          [--ignore-date] [--ignore-space-change | --ignore-whitespace]
-         [--whitespace=&lt;option&gt;] [-C&lt;n&gt;] [-p&lt;n&gt;] [--directory=&lt;dir&gt;]
+         [--whitespace=&lt;action&gt;] [-C&lt;n&gt;] [-p&lt;n&gt;] [--directory=&lt;dir&gt;]
          [--exclude=&lt;path&gt;] [--include=&lt;path&gt;] [--reject] [-q | --quiet]
          [--[no-]scissors] [-S[&lt;keyid&gt;]] [--patch-format=&lt;format&gt;]
          [--quoted-cr=&lt;action&gt;]
@@ -975,7 +975,7 @@ <h2 id="_options">OPTIONS</h2>
 --ignore-whitespace
 </dt>
 <dt class="hdlist1">
---whitespace=&lt;option&gt;
+--whitespace=&lt;action&gt;
 </dt>
 <dt class="hdlist1">
 -C&lt;n&gt;
@@ -1289,7 +1289,7 @@ <h2 id="_git">GIT</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-10-23 14:43:46 PDT
+ 2023-10-30 08:42:00 JST
 </div>
 </div>
 </body>

diff --git a/git-am.txt b/git-am.txt
@@ -12,7 +12,7 @@ SYNOPSIS
 'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8] [--no-verify]
 	 [--[no-]3way] [--interactive] [--committer-date-is-author-date]
 	 [--ignore-date] [--ignore-space-change | --ignore-whitespace]
-	 [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
+	 [--whitespace=<action>] [-C<n>] [-p<n>] [--directory=<dir>]
 	 [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
 	 [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]
 	 [--quoted-cr=<action>]
@@ -118,7 +118,7 @@ include::rerere-options.txt[]
 
 --ignore-space-change::
 --ignore-whitespace::
---whitespace=<option>::
+--whitespace=<action>::
 -C<n>::
 -p<n>::
 --directory=<dir>::

diff --git a/git-annotate.html b/git-annotate.html
@@ -1089,7 +1089,7 @@ <h2 id="_git">GIT</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2022-10-28 11:53:56 PDT
+ 2022-10-29 03:53:56 JST
 </div>
 </div>
 </body>

diff --git a/git-apply.html b/git-apply.html
@@ -1248,7 +1248,7 @@ <h2 id="_git">GIT</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-10-23 14:43:46 PDT
+ 2023-10-24 06:43:46 JST
 </div>
 </div>
 </body>

diff --git a/git-archimport.html b/git-archimport.html
@@ -905,7 +905,7 @@ <h2 id="_git">GIT</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2021-12-10 14:52:02 PST
+ 2021-12-11 07:52:02 JST
 </div>
 </div>
 </body>

diff --git a/git-archive.html b/git-archive.html
@@ -1159,7 +1159,7 @@ <h2 id="_git">GIT</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-10-23 14:43:46 PDT
+ 2023-10-24 06:43:46 JST
 </div>
 </div>
 </body>

diff --git a/git-bisect.html b/git-bisect.html
@@ -1244,7 +1244,7 @@ <h2 id="_git">GIT</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-08-10 09:10:14 PDT
+ 2023-08-11 01:10:14 JST
 </div>
 </div>
 </body>

diff --git a/git-blame.html b/git-blame.html
@@ -1498,7 +1498,7 @@ <h2 id="_git">GIT</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-10-23 14:43:46 PDT
+ 2023-10-24 06:43:46 JST
 </div>
 </div>
 </body>

diff --git a/git-branch.html b/git-branch.html
@@ -1265,7 +1265,7 @@ <h2 id="_options">OPTIONS</h2>
         multiple times, in which case the last key becomes the primary
         key. The keys supported are the same as those in <code>git
         for-each-ref</code>. Sort order defaults to the value configured for the
-        <code>branch.sort</code> variable if exists, or to sorting based on the
+        <code>branch.sort</code> variable if it exists, or to sorting based on the
         full refname (including <code>refs/...</code> prefix). This lists
         detached HEAD (if present) first, then local branches and
         finally remote-tracking branches. See <a href="git-config.html">git-config(1)</a>.
@@ -1592,7 +1592,7 @@ <h2 id="_git">GIT</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-04-21 15:58:28 PDT
+ 2023-10-30 08:42:00 JST
 </div>
 </div>
 </body>

diff --git a/git-branch.txt b/git-branch.txt
@@ -324,7 +324,7 @@ superproject's "origin/main", but tracks the submodule's "origin/main".
 	multiple times, in which case the last key becomes the primary
 	key. The keys supported are the same as those in `git
 	for-each-ref`. Sort order defaults to the value configured for the
-	`branch.sort` variable if exists, or to sorting based on the
+	`branch.sort` variable if it exists, or to sorting based on the
 	full refname (including `refs/...` prefix). This lists
 	detached HEAD (if present) first, then local branches and
 	finally remote-tracking branches. See linkgit:git-config[1].

diff --git a/git-bugreport.html b/git-bugreport.html
@@ -880,7 +880,7 @@ <h2 id="_git">GIT</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-10-23 14:43:46 PDT
+ 2023-10-24 06:43:46 JST
 </div>
 </div>
 </body>

diff --git a/git-bundle.html b/git-bundle.html
@@ -1104,7 +1104,7 @@ <h2 id="_git">GIT</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-03-19 15:16:41 PDT
+ 2023-03-20 07:16:41 JST
 </div>
 </div>
 </body>

diff --git a/git-cat-file.html b/git-cat-file.html
@@ -1342,7 +1342,7 @@ <h2 id="_git">GIT</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-10-18 13:44:22 PDT
+ 2023-10-19 05:44:22 JST
 </div>
 </div>
 </body>