summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-09-09 15:08:29 -0700
committerJunio C Hamano <gitster@pobox.com>2022-09-09 15:08:29 -0700
commit80d588f33da8bcdfec5509ef613c45bb19607d36 (patch)
tree48c74671e09cc74d27ae10f131941f999027770c
parentc4f7799fb198cf50c4132036d5c9eb79184ee00b (diff)
downloadgit-htmldocs-80d588f33da8bcdfec5509ef613c45bb19607d36.tar.gz
Autogenerated HTML docs for v2.37.3-542-gdd3f6
-rw-r--r--RelNotes/2.38.0.txt19
-rw-r--r--git-config.html9
-rw-r--r--git-format-patch.html18
-rw-r--r--git-format-patch.txt11
-rw-r--r--git-interpret-trailers.html12
-rw-r--r--git-interpret-trailers.txt10
-rw-r--r--git-range-diff.html7
-rw-r--r--git-range-diff.txt4
-rw-r--r--howto/coordinate-embargoed-releases.html2
-rw-r--r--howto/keep-canonical-history-correct.html2
-rw-r--r--howto/maintain-git.html2
-rw-r--r--howto/new-command.html2
-rw-r--r--howto/rebase-from-internal-branch.html2
-rw-r--r--howto/rebuild-from-update-hook.html2
-rw-r--r--howto/recover-corrupted-blob-object.html2
-rw-r--r--howto/recover-corrupted-object-harder.html2
-rw-r--r--howto/revert-a-faulty-merge.html2
-rw-r--r--howto/revert-branch-rebase.html2
-rw-r--r--howto/separating-topic-branches.html2
-rw-r--r--howto/setup-git-server-over-http.html2
-rw-r--r--howto/update-hook-example.html2
-rw-r--r--howto/use-git-daemon.html2
-rw-r--r--howto/using-merge-subtree.html2
-rw-r--r--howto/using-signed-tag-in-pull-request.html2
24 files changed, 94 insertions, 28 deletions
diff --git a/RelNotes/2.38.0.txt b/RelNotes/2.38.0.txt
index f521e930b..7e272b45b 100644
--- a/RelNotes/2.38.0.txt
+++ b/RelNotes/2.38.0.txt
@@ -75,6 +75,12 @@ UI, Workflows & Features
* "git clone" command learned the "--bundle-uri" option to coordinate
with hosting sites the use of pre-prepared bundle files.
+ * "git range-diff" learned to honor pathspec argument if given.
+
+ * "git format-patch --from=<ident>" can be told to add an in-body
+ "From:" line even for commits that are authored by the given
+ <ident> with "--force-in-body-from"option.
+
Performance, Internal Implementation, Development Support etc.
@@ -148,6 +154,9 @@ Performance, Internal Implementation, Development Support etc.
* The pack bitmap file gained a bitmap-lookup table to speed up
locating the necessary bitmap for a given commit.
+ * The assembly version of SHA-1 implementation for PPC has been
+ removed.
+
Fixes since v2.37
-----------------
@@ -323,6 +332,16 @@ Fixes since v2.37
to schedule tasks.
(merge ee69e7884e bc/gc-crontab-fix later to maint).
+ * Those who use diff-so-fancy as the diff-filter noticed a regression
+ or two in the code that parses the diff output in the built-in
+ version of "add -p", which has been corrected.
+ (merge 0a101676e5 js/add-p-diff-parsing-fix later to maint).
+
+ * Segfault fix-up to an earlier fix to the topic to teach "git reset"
+ and "git checkout" work better in a sparse checkout.
+ (merge 037f8ea6d9 vd/sparse-reset-checkout-fixes later to maint).
+
* Other code cleanup, docfix, build fix, etc.
(merge 77b9e85c0f vd/fix-perf-tests later to maint).
(merge 0682bc43f5 jk/test-crontab-fixes later to maint).
+ (merge b46dd1726c cc/doc-trailer-whitespace-rules later to maint).
diff --git a/git-config.html b/git-config.html
index 7a4a40c93..8de112050 100644
--- a/git-config.html
+++ b/git-config.html
@@ -5552,6 +5552,15 @@ format.from
</p>
</dd>
<dt class="hdlist1">
+format.forceInBodyFrom
+</dt>
+<dd>
+<p>
+ Provides the default value for the <code>--[no-]force-in-body-from</code>
+ option to format-patch. Defaults to false.
+</p>
+</dd>
+<dt class="hdlist1">
format.numbered
</dt>
<dd>
diff --git a/git-format-patch.html b/git-format-patch.html
index 98bc97cc2..520db4fa4 100644
--- a/git-format-patch.html
+++ b/git-format-patch.html
@@ -1921,6 +1921,22 @@ transformation for you, and this option should not be used if you are
feeding the result to <code>git send-email</code>.</p></div>
</dd>
<dt class="hdlist1">
+--[no-]force-in-body-from
+</dt>
+<dd>
+<p>
+ With the e-mail sender specified via the <code>--from</code> option, by
+ default, an in-body "From:" to identify the real author of
+ the commit is added at the top of the commit log message if
+ the sender is different from the author. With this option,
+ the in-body "From:" is added even when the sender and the
+ author have the same name and address, which may help if the
+ mailing list software mangles the sender&#8217;s identity.
+ Defaults to the value of the <code>format.forceInBodyFrom</code>
+ configuration variable.
+</p>
+</dd>
+<dt class="hdlist1">
--add-header=&lt;header&gt;
</dt>
<dd>
@@ -2578,7 +2594,7 @@ merge commit.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2022-01-05 14:13:29 PST
+ 2022-09-09 15:06:28 PDT
</div>
</div>
</body>
diff --git a/git-format-patch.txt b/git-format-patch.txt
index be797d7a2..dfcc7da4c 100644
--- a/git-format-patch.txt
+++ b/git-format-patch.txt
@@ -275,6 +275,17 @@ header). Note also that `git send-email` already handles this
transformation for you, and this option should not be used if you are
feeding the result to `git send-email`.
+--[no-]force-in-body-from::
+ With the e-mail sender specified via the `--from` option, by
+ default, an in-body "From:" to identify the real author of
+ the commit is added at the top of the commit log message if
+ the sender is different from the author. With this option,
+ the in-body "From:" is added even when the sender and the
+ author have the same name and address, which may help if the
+ mailing list software mangles the sender's identity.
+ Defaults to the value of the `format.forceInBodyFrom`
+ configuration variable.
+
--add-header=<header>::
Add an arbitrary header to the email headers. This is in addition
to any configured headers, and may be used multiple times.
diff --git a/git-interpret-trailers.html b/git-interpret-trailers.html
index c8ad9e5ba..043c98c31 100644
--- a/git-interpret-trailers.html
+++ b/git-interpret-trailers.html
@@ -797,10 +797,12 @@ The group must either be at the end of the message or be the last
non-whitespace lines before a line that starts with <em>---</em> (followed by a
space or the end of the line). Such three minus signs start the patch
part of the message. See also <code>--no-divider</code> below.</p></div>
-<div class="paragraph"><p>When reading trailers, there can be whitespaces after the
-token, the separator and the value. There can also be whitespaces
-inside the token and the value. The value may be split over multiple lines with
-each subsequent line starting with whitespace, like the "folding" in RFC 822.</p></div>
+<div class="paragraph"><p>When reading trailers, there can be no whitespace before or inside the
+token, but any number of regular space and tab characters are allowed
+between the token and the separator. There can be whitespaces before,
+inside or after the value. The value may be split over multiple lines
+with each subsequent line starting with at least one whitespace, like
+the "folding" in RFC 822.</p></div>
<div class="paragraph"><p>Note that <em>trailers</em> do not follow and are not intended to follow many
rules for RFC 822 headers. For example they do not follow
the encoding rules and probably many other rules.</p></div>
@@ -1327,7 +1329,7 @@ $ chmod +x .git/hooks/commit-msg</code></pre>
<div id="footer">
<div id="footer-text">
Last updated
- 2021-05-12 22:11:31 PDT
+ 2022-09-09 15:06:28 PDT
</div>
</div>
</body>
diff --git a/git-interpret-trailers.txt b/git-interpret-trailers.txt
index 956a01d18..6d6197cd0 100644
--- a/git-interpret-trailers.txt
+++ b/git-interpret-trailers.txt
@@ -60,10 +60,12 @@ non-whitespace lines before a line that starts with '---' (followed by a
space or the end of the line). Such three minus signs start the patch
part of the message. See also `--no-divider` below.
-When reading trailers, there can be whitespaces after the
-token, the separator and the value. There can also be whitespaces
-inside the token and the value. The value may be split over multiple lines with
-each subsequent line starting with whitespace, like the "folding" in RFC 822.
+When reading trailers, there can be no whitespace before or inside the
+token, but any number of regular space and tab characters are allowed
+between the token and the separator. There can be whitespaces before,
+inside or after the value. The value may be split over multiple lines
+with each subsequent line starting with at least one whitespace, like
+the "folding" in RFC 822.
Note that 'trailers' do not follow and are not intended to follow many
rules for RFC 822 headers. For example they do not follow
diff --git a/git-range-diff.html b/git-range-diff.html
index af4e800d8..3a720e4d6 100644
--- a/git-range-diff.html
+++ b/git-range-diff.html
@@ -752,7 +752,8 @@ git-range-diff(1) Manual Page
<pre class="content"><em>git range-diff</em> [--color=[&lt;when&gt;]] [--no-color] [&lt;diff-options&gt;]
[--no-dual-color] [--creation-factor=&lt;factor&gt;]
[--left-only | --right-only]
- ( &lt;range1&gt; &lt;range2&gt; | &lt;rev1&gt;&#8230;&lt;rev2&gt; | &lt;base&gt; &lt;rev1&gt; &lt;rev2&gt; )</pre>
+ ( &lt;range1&gt; &lt;range2&gt; | &lt;rev1&gt;&#8230;&lt;rev2&gt; | &lt;base&gt; &lt;rev1&gt; &lt;rev2&gt; )
+ [[--] &lt;path&gt;&#8230;]</pre>
<div class="attribution">
</div></div>
</div>
@@ -762,6 +763,8 @@ git-range-diff(1) Manual Page
<div class="sectionbody">
<div class="paragraph"><p>This command shows the differences between two versions of a patch
series, or more generally, two commit ranges (ignoring merge commits).</p></div>
+<div class="paragraph"><p>In the presence of <code>&lt;path&gt;</code> arguments, these commit ranges are limited
+accordingly.</p></div>
<div class="paragraph"><p>To that end, it first finds pairs of commits from both commit ranges
that correspond with each other. Two commits are said to correspond when
the diff between their patches (i.e. the author information, the commit
@@ -1082,7 +1085,7 @@ found in this case will look like this:</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2021-02-26 23:35:19 PST
+ 2022-09-09 15:06:28 PDT
</div>
</div>
</body>
diff --git a/git-range-diff.txt b/git-range-diff.txt
index fe350d7f4..0b393715d 100644
--- a/git-range-diff.txt
+++ b/git-range-diff.txt
@@ -12,6 +12,7 @@ SYNOPSIS
[--no-dual-color] [--creation-factor=<factor>]
[--left-only | --right-only]
( <range1> <range2> | <rev1>...<rev2> | <base> <rev1> <rev2> )
+ [[--] <path>...]
DESCRIPTION
-----------
@@ -19,6 +20,9 @@ DESCRIPTION
This command shows the differences between two versions of a patch
series, or more generally, two commit ranges (ignoring merge commits).
+In the presence of `<path>` arguments, these commit ranges are limited
+accordingly.
+
To that end, it first finds pairs of commits from both commit ranges
that correspond with each other. Two commits are said to correspond when
the diff between their patches (i.e. the author information, the commit
diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html
index 32897da96..57722593b 100644
--- a/howto/coordinate-embargoed-releases.html
+++ b/howto/coordinate-embargoed-releases.html
@@ -873,7 +873,7 @@ Thanks,
<div id="footer">
<div id="footer-text">
Last updated
- 2022-09-05 18:36:45 PDT
+ 2022-09-09 15:07:00 PDT
</div>
</div>
</body>
diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index 5bb11b5e7..4b9b3366b 100644
--- a/howto/keep-canonical-history-correct.html
+++ b/howto/keep-canonical-history-correct.html
@@ -938,7 +938,7 @@ tip of your <em>master</em> again and redo the two merges:</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2022-09-05 18:36:44 PDT
+ 2022-09-09 15:07:00 PDT
</div>
</div>
</body>
diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index fd297effc..06f2c2f31 100644
--- a/howto/maintain-git.html
+++ b/howto/maintain-git.html
@@ -1469,7 +1469,7 @@ $ git update-ref -d $mf/ai/topic</code></pre>
<div id="footer">
<div id="footer-text">
Last updated
- 2022-09-05 18:36:44 PDT
+ 2022-09-09 15:07:00 PDT
</div>
</div>
</body>
diff --git a/howto/new-command.html b/howto/new-command.html
index ef652848c..ca591300d 100644
--- a/howto/new-command.html
+++ b/howto/new-command.html
@@ -863,7 +863,7 @@ letter [PATCH 0/n].
<div id="footer">
<div id="footer-text">
Last updated
- 2022-09-05 18:36:41 PDT
+ 2022-09-09 15:06:58 PDT
</div>
</div>
</body>
diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index f368df7e8..8354488ff 100644
--- a/howto/rebase-from-internal-branch.html
+++ b/howto/rebase-from-internal-branch.html
@@ -895,7 +895,7 @@ the #1' commit.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2022-09-05 18:36:44 PDT
+ 2022-09-09 15:07:00 PDT
</div>
</div>
</body>
diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index 847d0d053..912b61722 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
<div id="footer">
<div id="footer-text">
Last updated
- 2022-09-05 18:36:44 PDT
+ 2022-09-09 15:07:00 PDT
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index c652752a6..9abd3403a 100644
--- a/howto/recover-corrupted-blob-object.html
+++ b/howto/recover-corrupted-blob-object.html
@@ -880,7 +880,7 @@ thing.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2022-09-05 18:36:43 PDT
+ 2022-09-09 15:07:00 PDT
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index 799f1aa2b..9cb60aa01 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)
<div id="footer">
<div id="footer-text">
Last updated
- 2022-09-05 18:36:44 PDT
+ 2022-09-09 15:07:00 PDT
</div>
</div>
</body>
diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index 1132e4784..c894474a3 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
<div id="footer">
<div id="footer-text">
Last updated
- 2022-09-05 18:36:43 PDT
+ 2022-09-09 15:07:00 PDT
</div>
</div>
</body>
diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index e02bd2418..a311c0a58 100644
--- a/howto/revert-branch-rebase.html
+++ b/howto/revert-branch-rebase.html
@@ -907,7 +907,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f
<div id="footer">
<div id="footer-text">
Last updated
- 2022-09-05 18:36:41 PDT
+ 2022-09-09 15:06:58 PDT
</div>
</div>
</body>
diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index 60dcf3eeb..84fcc48f0 100644
--- a/howto/separating-topic-branches.html
+++ b/howto/separating-topic-branches.html
@@ -841,7 +841,7 @@ o---o"master"</code></pre>
<div id="footer">
<div id="footer-text">
Last updated
- 2022-09-05 18:36:43 PDT
+ 2022-09-09 15:06:59 PDT
</div>
</div>
</body>
diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index 7224fe463..5da64fecd 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.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2022-09-05 18:36:42 PDT
+ 2022-09-09 15:06:59 PDT
</div>
</div>
</body>
diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index 451e5d965..53f0ebe34 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.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2022-09-05 18:36:42 PDT
+ 2022-09-09 15:06:59 PDT
</div>
</div>
</body>
diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index e4e9daf51..e282e9bd9 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.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2022-09-05 18:36:42 PDT
+ 2022-09-09 15:06:59 PDT
</div>
</div>
</body>
diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index 05a0c23e8..de1278489 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
<div id="footer">
<div id="footer-text">
Last updated
- 2022-09-05 18:36:41 PDT
+ 2022-09-09 15:06:58 PDT
</div>
</div>
</body>
diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html
index 013164cb8..2303e5750 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.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2022-09-05 18:36:42 PDT
+ 2022-09-09 15:06:59 PDT
</div>
</div>
</body>