Skip to content

Commit 75b8a94

Browse files
committed
Autogenerated HTML docs for v2.52.0-199-gbdc53
1 parent 63e1612 commit 75b8a94

File tree

9 files changed

+1190
-20
lines changed

9 files changed

+1190
-20
lines changed

‎RelNotes/2.53.0.adoc‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ UI, Workflows & Features
2020

2121
* Add a new manual that describes the data model.
2222

23+
* "git fast-import" learns "--strip-if-invalid" option to drop
24+
invalid cryptographic signature from objects.
25+
2326

2427
Performance, Internal Implementation, Development Support etc.
2528
--------------------------------------------------------------
@@ -38,6 +41,13 @@ Performance, Internal Implementation, Development Support etc.
3841
* A part of code paths that deals with loose objects has been cleaned
3942
up.
4043
44+
* "make strip" has been taught to strip "scalar" as well as "git".
45+
46+
* Dockerised jobs at the GitHub Actions CI have been taught to show
47+
more details of failed tests.
48+
49+
* Code refactoring around object database sources.
50+
4151
4252
Fixes since v2.52
4353
-----------------
@@ -105,8 +115,29 @@ Fixes since v2.52
105115
* Various issues detected by Asan have been corrected.
106116
(merge a031b6181a jk/asan-bonanza later to maint).
107117

118+
* "git config get --path" segfaulted on an ":(optional)path" that
119+
does not exist, which has been corrected.
120+
(merge 0bd16856ff jc/optional-path later to maint).
121+
122+
* The "--committer-date-is-author-date" option of "git am/rebase" is
123+
a misguided one. The documentation is updated to discourage its
124+
use.
125+
(merge fbf3d0669f kh/doc-committer-date-is-author-date later to maint).
126+
127+
* The option help text given by "git config unset -h" described
128+
the "--all" option to "replace", not "unset", multiple variables,
129+
which has been corrected.
130+
(merge 18bf67b753 rs/config-unset-opthelp-fix later to maint).
131+
132+
* The error message given by "git config set", when the variable
133+
being updated has more than one values defined, used old style "git
134+
config" syntax with an incorrect option in its hint, both of which
135+
have been corrected.
136+
(merge df963f0df4 rs/config-set-multi-error-message-fix later to maint).
137+
108138
* Other code cleanup, docfix, build fix, etc.
109139
(merge 46207a54cc qj/doc-http-bad-want-response later to maint).
110140
(merge df90eccd93 kh/doc-commit-extra-references later to maint).
111141
(merge f18aa68861 rs/xmkstemp-simplify later to maint).
112142
(merge fddba8f737 ja/doc-synopsis-style later to maint).
143+
(merge 22ce0cb639 en/xdiff-cleanup-2 later to maint).

‎git-am.adoc‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,13 @@ Valid <action> for the `--whitespace` option are:
162162
commit creation as the committer date. This allows the
163163
user to lie about the committer date by using the same
164164
value as the author date.
165+
+
166+
WARNING: The history walking machinery assumes that commits have
167+
non-decreasing commit timestamps. You should consider if you really need
168+
to use this option. Then you should only use this option to override the
169+
committer date when applying commits on top of a base which commit is
170+
older (in terms of the commit date) than the oldest patch you are
171+
applying.
165172

166173
--ignore-date::
167174
By default the command records the date from the e-mail

‎git-am.html‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -656,6 +656,23 @@ <h2 id="_options">OPTIONS</h2>
656656
commit creation as the committer date. This allows the
657657
user to lie about the committer date by using the same
658658
value as the author date.</p>
659+
<divclass="admonitionblock warning">
660+
<table>
661+
<tr>
662+
<tdclass="icon">
663+
<divclass="title">Warning</div>
664+
</td>
665+
<tdclass="content">
666+
The history walking machinery assumes that commits have
667+
non-decreasing commit timestamps. You should consider if you really need
668+
to use this option. Then you should only use this option to override the
669+
committer date when applying commits on top of a base which commit is
670+
older (in terms of the commit date) than the oldest patch you are
671+
applying.
672+
</td>
673+
</tr>
674+
</table>
675+
</div>
659676
</dd>
660677
<dtclass="hdlist1">--ignore-date</dt>
661678
<dd>
@@ -870,7 +887,7 @@ <h2 id="_git">GIT</h2>
870887
</div>
871888
<divid="footer">
872889
<divid="footer-text">
873-
Last updated 2025-08-25 14:46:08 -0700
890+
Last updated 2025-12-07 12:37:45 +0900
874891
</div>
875892
</div>
876893
</body>

‎git-fast-import.adoc‎

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,26 @@ fast-import stream! This option is enabled automatically for
6666
remote-helpers that use the `import` capability, as they are
6767
already trusted to run their own code.
6868

69-
--signed-tags=(verbatim|warn-verbatim|warn-strip|strip|abort)::
70-
Specify how to handle signed tags. Behaves in the same way
71-
as the same option in linkgit:git-fast-export[1], except that
72-
default is 'verbatim' (instead of 'abort').
73-
74-
--signed-commits=(verbatim|warn-verbatim|warn-strip|strip|abort)::
75-
Specify how to handle signed commits. Behaves in the same way
76-
as the same option in linkgit:git-fast-export[1], except that
77-
default is 'verbatim' (instead of 'abort').
69+
`--signed-tags=(verbatim|warn-verbatim|warn-strip|strip|abort)`::
70+
Specify how to handle signed tags. Behaves in the same way as
71+
the `--signed-commits=<mode>` below, except that the
72+
`strip-if-invalid` mode is not yet supported. Like for signed
73+
commits, the default mode is `verbatim`.
74+
75+
`--signed-commits=<mode>`::
76+
Specify how to handle signed commits. The following <mode>s
77+
are supported:
78+
+
79+
* `verbatim`, which is the default, will silently import commit
80+
signatures.
81+
* `warn-verbatim` will import them, but will display a warning.
82+
* `abort` will make this program die when encountering a signed
83+
commit.
84+
* `strip` will silently make the commits unsigned.
85+
* `warn-strip` will make them unsigned, but will display a warning.
86+
* `strip-if-invalid` will check signatures and, if they are invalid,
87+
will strip them and display a warning. The validation is performed
88+
in the same way as linkgit:git-verify-commit[1] does it.
7889

7990
Options for Frontends
8091
~~~~~~~~~~~~~~~~~~~~~

‎git-fast-import.html‎

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -523,17 +523,43 @@ <h2 id="_options">OPTIONS</h2>
523523
already trusted to run their own code.</p>
524524
</div>
525525
</dd>
526-
<dtclass="hdlist1">--signed-tags=(verbatim|warn-verbatim|warn-strip|strip|abort)</dt>
526+
<dtclass="hdlist1"><code>--signed-tags=</code>(<code>verbatim</code>|<code>warn-verbatim</code>|<code>warn-strip</code>|<code>strip</code>|<code>abort</code>)</dt>
527527
<dd>
528-
<p>Specify how to handle signed tags. Behaves in the same way
529-
as the same option in <ahref="git-fast-export.html">git-fast-export(1)</a>, except that
530-
default is <em>verbatim</em> (instead of <em>abort</em>).</p>
528+
<p>Specify how to handle signed tags. Behaves in the same way as
529+
the <code>--signed-commits=</code><em>&lt;mode&gt;</em> below, except that the
530+
<code>strip-if-invalid</code> mode is not yet supported. Like for signed
531+
commits, the default mode is <code>verbatim</code>.</p>
531532
</dd>
532-
<dtclass="hdlist1">--signed-commits=(verbatim|warn-verbatim|warn-strip|strip|abort)</dt>
533+
<dtclass="hdlist1"><code>--signed-commits=</code><em>&lt;mode&gt;</em></dt>
533534
<dd>
534-
<p>Specify how to handle signed commits. Behaves in the same way
535-
as the same option in <ahref="git-fast-export.html">git-fast-export(1)</a>, except that
536-
default is <em>verbatim</em> (instead of <em>abort</em>).</p>
535+
<p>Specify how to handle signed commits. The following &lt;mode&gt;s
536+
are supported:</p>
537+
<divclass="ulist">
538+
<ul>
539+
<li>
540+
<p><code>verbatim</code>, which is the default, will silently import commit
541+
signatures.</p>
542+
</li>
543+
<li>
544+
<p><code>warn-verbatim</code> will import them, but will display a warning.</p>
545+
</li>
546+
<li>
547+
<p><code>abort</code> will make this program die when encountering a signed
548+
commit.</p>
549+
</li>
550+
<li>
551+
<p><code>strip</code> will silently make the commits unsigned.</p>
552+
</li>
553+
<li>
554+
<p><code>warn-strip</code> will make them unsigned, but will display a warning.</p>
555+
</li>
556+
<li>
557+
<p><code>strip-if-invalid</code> will check signatures and, if they are invalid,
558+
will strip them and display a warning. The validation is performed
559+
in the same way as <ahref="git-verify-commit.html">git-verify-commit(1)</a> does it.</p>
560+
</li>
561+
</ul>
562+
</div>
537563
</dd>
538564
</dl>
539565
</div>
@@ -2619,7 +2645,7 @@ <h2 id="_git">GIT</h2>
26192645
</div>
26202646
<divid="footer">
26212647
<divid="footer-text">
2622-
Last updated 2025-10-28 12:16:15 -0700
2648+
Last updated 2025-12-07 12:37:45 +0900
26232649
</div>
26242650
</div>
26252651
</body>

‎git-rebase.adoc‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -474,6 +474,13 @@ See also INCOMPATIBLE OPTIONS below.
474474
Instead of using the current time as the committer date, use
475475
the author date of the commit being rebased as the committer
476476
date. This option implies `--force-rebase`.
477+
+
478+
WARNING: The history walking machinery assumes that commits have
479+
non-decreasing commit timestamps. You should consider if you really need
480+
to use this option. Then you should only use this option to override the
481+
committer date when rebasing commits on top of a base which commit is
482+
older (in terms of the commit date) than the oldest commit you are
483+
applying (in terms of the author date).
477484

478485
--ignore-date::
479486
--reset-author-date::

‎git-rebase.html‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1092,6 +1092,23 @@ <h2 id="_options">OPTIONS</h2>
10921092
<p>Instead of using the current time as the committer date, use
10931093
the author date of the commit being rebased as the committer
10941094
date. This option implies <code>--force-rebase</code>.</p>
1095+
<divclass="admonitionblock warning">
1096+
<table>
1097+
<tr>
1098+
<tdclass="icon">
1099+
<divclass="title">Warning</div>
1100+
</td>
1101+
<tdclass="content">
1102+
The history walking machinery assumes that commits have
1103+
non-decreasing commit timestamps. You should consider if you really need
1104+
to use this option. Then you should only use this option to override the
1105+
committer date when rebasing commits on top of a base which commit is
1106+
older (in terms of the commit date) than the oldest commit you are
1107+
applying (in terms of the author date).
1108+
</td>
1109+
</tr>
1110+
</table>
1111+
</div>
10951112
</dd>
10961113
<dtclass="hdlist1">--ignore-date</dt>
10971114
<dtclass="hdlist1">--reset-author-date</dt>
@@ -2463,7 +2480,7 @@ <h2 id="_git">GIT</h2>
24632480
</div>
24642481
<divid="footer">
24652482
<divid="footer-text">
2466-
Last updated 2025-08-28 14:32:44 -0700
2483+
Last updated 2025-12-07 12:37:45 +0900
24672484
</div>
24682485
</div>
24692486
</body>

0 commit comments

Comments
(0)