Skip to content

Commit 7144b22

Browse files
committed
Autogenerated HTML docs for v2.50.0-145-g83014
1 parent a975a85 commit 7144b22

21 files changed

+229
-36
lines changed

BreakingChanges.adoc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,14 @@ These features will be removed.
183183
timeframe, in preference to its synonym "--annotate-stdin". Git 3.0
184184
removes the support for "--stdin" altogether.
185185

186+
* The git-whatchanged(1) command has outlived its usefulness more than
187+
10 years ago, and takes more keystrokes to type than its rough
188+
equivalent `git log --raw`. We have nominated the command for
189+
removal, have changed the command to refuse to work unless the
190+
`--i-still-use-this` option is given, and asked the users to report
191+
when they do so. So far there hasn't been a single complaint.
192+
+
193+
The command will be removed.
186194

187195
== Superseded features that will not be deprecated
188196

BreakingChanges.html

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -709,6 +709,17 @@ <h3 id="_removals">Removals</h3>
709709
timeframe, in preference to its synonym "--annotate-stdin". Git 3.0
710710
removes the support for "--stdin" altogether.</p>
711711
</li>
712+
<li>
713+
<p>The git-whatchanged(1) command has outlived its usefulness more than
714+
10 years ago, and takes more keystrokes to type than its rough
715+
equivalent <code>git</code> <code>log</code> <code>--raw</code>. We have nominated the command for
716+
removal, have changed the command to refuse to work unless the
717+
<code>--i-still-use-this</code> option is given, and asked the users to report
718+
when they do so. So far there hasn&#8217;t been a single complaint.</p>
719+
<div class="paragraph">
720+
<p>The command will be removed.</p>
721+
</div>
722+
</li>
712723
</ul>
713724
</div>
714725
</div>
@@ -747,7 +758,7 @@ <h2 id="_superseded_features_that_will_not_be_deprecated">Superseded features th
747758
</div>
748759
<div id="footer">
749760
<div id="footer-text">
750-
Last updated 2025-04-07 15:21:58 -0700
761+
Last updated 2025-06-30 16:59:08 -0700
751762
</div>
752763
</div>
753764
</body>

MyFirstObjectWalk.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,13 @@ int cmd_walken(int argc, const char **argv, const char *prefix)
8383
}
8484
----
8585

86-
Also add the relevant line in `builtin.h` near `cmd_whatchanged()`:
86+
Also add the relevant line in `builtin.h` near `cmd_version()`:
8787

8888
----
8989
int cmd_walken(int argc, const char **argv, const char *prefix, struct repository *repo);
9090
----
9191

92-
Include the command in `git.c` in `commands[]` near the entry for `whatchanged`,
92+
Include the command in `git.c` in `commands[]` near the entry for `version`,
9393
maintaining alphabetical ordering:
9494

9595
----

MyFirstObjectWalk.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -560,15 +560,15 @@ <h2 id="_setting_up">Setting Up</h2>
560560
</div>
561561
</div>
562562
<div class="paragraph">
563-
<p>Also add the relevant line in <code>builtin.h</code> near <code>cmd_whatchanged</code>():</p>
563+
<p>Also add the relevant line in <code>builtin.h</code> near <code>cmd_version</code>():</p>
564564
</div>
565565
<div class="listingblock">
566566
<div class="content">
567567
<pre>int cmd_walken(int argc, const char **argv, const char *prefix, struct repository *repo);</pre>
568568
</div>
569569
</div>
570570
<div class="paragraph">
571-
<p>Include the command in <code>git.c</code> in <code>commands</code>[] near the entry for <code>whatchanged</code>,
571+
<p>Include the command in <code>git.c</code> in <code>commands</code>[] near the entry for <code>version</code>,
572572
maintaining alphabetical ordering:</p>
573573
</div>
574574
<div class="listingblock">
@@ -1701,7 +1701,7 @@ <h2 id="_wrapping_up">Wrapping Up</h2>
17011701
</div>
17021702
<div id="footer">
17031703
<div id="footer-text">
1704-
Last updated 2025-06-18 14:54:41 -0700
1704+
Last updated 2025-06-30 16:59:08 -0700
17051705
</div>
17061706
</div>
17071707
</body>

RelNotes/2.51.0.adoc

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

2121
* "git subtree" (in contrib/) learned to grok GPG signing its commits.
2222

23+
* "git whatchanged" that is longer to type than "git log --raw"
24+
which is its modern rough equivalent has outlived its usefulness
25+
more than 10 years ago. Plan to deprecate and remove it.
26+
27+
* An interchange format for stash entries is defined, and subcommand
28+
of "git stash" to import/export has been added.
29+
30+
* "git merge/pull" has been taught the "--compact-summary" option to
31+
use the compact-summary format, intead of diffstat, when showing
32+
the summary of the incoming changes.
33+
2334

2435
Performance, Internal Implementation, Development Support etc.
2536
--------------------------------------------------------------
@@ -37,6 +48,9 @@ Performance, Internal Implementation, Development Support etc.
3748
* "Do not explicitly initialize to zero" rule has been clarified in
3849
the CodingGuidelines document.
3950
51+
* A test helper "test_seq" function learned the "-f <fmt>" option,
52+
which allowed us to simplify a lot of test scripts.
53+
4054
4155
Fixes since v2.50
4256
-----------------
@@ -69,6 +83,16 @@ Fixes since v2.50
6983
correctly parsed and replaced, which has been corrected.
7084
(merge abf94a283f sa/multi-mailmap-fix later to maint).
7185

86+
* "git maintenance" lacked the care "git gc" had to avoid holding
87+
onto the repository lock for too long during packing refs, which
88+
has been remedied.
89+
(merge 1b5074e614 ps/maintenance-ref-lock later to maint).
90+
91+
* Avoid regexp_constraint and instead use comparison_constraint when
92+
listing functions to exclude from application of coccinelle rules,
93+
as spatch can be built with different regexp engine X-<.
94+
(merge f2ad545813 jc/cocci-avoid-regexp-constraint later to maint).
95+
7296
* Other code cleanup, docfix, build fix, etc.
7397
(merge b257adb571 lo/my-first-ow-doc-update later to maint).
7498
(merge 8b34b6a220 ly/sequencer-update-squash-is-fixup-only later to maint).
@@ -82,3 +106,4 @@ Fixes since v2.50
82106
(merge 1fde1c5daf ac/preload-index-wo-the-repository later to maint).
83107
(merge 855cfc65ae rm/t2400-modernize later to maint).
84108
(merge 2939494284 ly/run-builtin-use-passed-in-repo later to maint).
109+
(merge ff73f375bb jg/mailinfo-leakfix later to maint).

git-config.html

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6479,8 +6479,10 @@ <h3 id="_variables">Variables</h3>
64796479
</dd>
64806480
<dt class="hdlist1">log.abbrevCommit</dt>
64816481
<dd>
6482-
<p>If true, makes <a href="git-log.html">git-log(1)</a>, <a href="git-show.html">git-show(1)</a>, and
6483-
<a href="git-whatchanged.html">git-whatchanged(1)</a> assume <code>--abbrev-commit</code>. You may
6482+
<p>If true, makes
6483+
<a href="git-log.html">git-log(1)</a>, <a href="git-show.html">git-show(1)</a>, and
6484+
<a href="git-whatchanged.html">git-whatchanged(1)</a>
6485+
assume <code>--abbrev-commit</code>. You may
64846486
override this option with <code>--no-abbrev-commit</code>.</p>
64856487
</dd>
64866488
<dt class="hdlist1">log.date</dt>
@@ -6862,8 +6864,33 @@ <h3 id="_variables">Variables</h3>
68626864
</dd>
68636865
<dt class="hdlist1"><code>merge.stat</code></dt>
68646866
<dd>
6865-
<p>Whether to print the diffstat between <code>ORIG_HEAD</code> and the merge result
6866-
at the end of the merge. True by default.</p>
6867+
<p>What, if anything, to print between <code>ORIG_HEAD</code> and the merge result
6868+
at the end of the merge. Possible values are:</p>
6869+
<div class="openblock">
6870+
<div class="content">
6871+
<div class="dlist">
6872+
<dl>
6873+
<dt class="hdlist1"><code>false</code></dt>
6874+
<dd>
6875+
<p>Show nothing.</p>
6876+
</dd>
6877+
<dt class="hdlist1"><code>true</code></dt>
6878+
<dd>
6879+
<p>Show <code>git</code> <code>diff</code> <code>--diffstat</code> <code>--summary</code> <code>ORIG_HEAD</code>.</p>
6880+
</dd>
6881+
<dt class="hdlist1"><code>compact</code></dt>
6882+
<dd>
6883+
<p>Show <code>git</code> <code>diff</code> <code>--compact-summary</code> <code>ORIG_HEAD</code>.</p>
6884+
</dd>
6885+
</dl>
6886+
</div>
6887+
</div>
6888+
</div>
6889+
<div class="paragraph">
6890+
<p>but any unrecognised value (e.g., a value added by a future version of
6891+
Git) is taken as <code>true</code> instead of triggering an error. Defaults to
6892+
<code>true</code>.</p>
6893+
</div>
68676894
</dd>
68686895
<dt class="hdlist1"><code>merge.autoStash</code></dt>
68696896
<dd>
@@ -9787,7 +9814,7 @@ <h2 id="_git">GIT</h2>
97879814
</div>
97889815
<div id="footer">
97899816
<div id="footer-text">
9790-
Last updated 2025-02-21 13:44:53 -0800
9817+
Last updated 2025-06-20 18:10:42 -0700
97919818
</div>
97929819
</div>
97939820
</body>

git-log.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4231,8 +4231,10 @@ <h2 id="_configuration">CONFIGURATION</h2>
42314231
<dl>
42324232
<dt class="hdlist1">log.abbrevCommit</dt>
42334233
<dd>
4234-
<p>If true, makes <a href="git-log.html">git-log(1)</a>, <a href="git-show.html">git-show(1)</a>, and
4235-
<a href="git-whatchanged.html">git-whatchanged(1)</a> assume <code>--abbrev-commit</code>. You may
4234+
<p>If true, makes
4235+
<a href="git-log.html">git-log(1)</a>, <a href="git-show.html">git-show(1)</a>, and
4236+
<a href="git-whatchanged.html">git-whatchanged(1)</a>
4237+
assume <code>--abbrev-commit</code>. You may
42364238
override this option with <code>--no-abbrev-commit</code>.</p>
42374239
</dd>
42384240
<dt class="hdlist1">log.date</dt>
@@ -4405,7 +4407,7 @@ <h2 id="_git">GIT</h2>
44054407
</div>
44064408
<div id="footer">
44074409
<div id="footer-text">
4408-
Last updated 2025-02-14 21:38:14 -0800
4410+
Last updated 2025-06-20 18:10:42 -0700
44094411
</div>
44104412
</div>
44114413
</body>

git-merge.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ git-merge - Join two or more development histories together
99
SYNOPSIS
1010
--------
1111
[synopsis]
12-
git merge [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]
12+
git merge [-n] [--stat] [--compact-summary] [--no-commit] [--squash] [--[no-]edit]
1313
[--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]
1414
[--[no-]allow-unrelated-histories]
1515
[--[no-]rerere-autoupdate] [-m <msg>] [-F <file>]

git-merge.html

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ <h2 id="_name">NAME</h2>
452452
<h2 id="_synopsis">SYNOPSIS</h2>
453453
<div class="sectionbody">
454454
<div class="verseblock">
455-
<pre class="content"><code>git</code> <code>merge</code> [<code>-n</code>] [<code>--stat</code>] [<code>--no-commit</code>] [<code>--squash</code>] [<code>--</code>[<code>no-</code>]<code>edit</code>]
455+
<pre class="content"><code>git</code> <code>merge</code> [<code>-n</code>] [<code>--stat</code>] [<code>--compact-summary</code>] [<code>--no-commit</code>] [<code>--squash</code>] [<code>--</code>[<code>no-</code>]<code>edit</code>]
456456
[<code>--no-verify</code>] [<code>-s</code> <em>&lt;strategy&gt;</em>] [<code>-X</code> <em>&lt;strategy-option&gt;</em>] [<code>-S</code>[<em>&lt;keyid&gt;</em>]]
457457
[<code>--</code>[<code>no-</code>]<code>allow-unrelated-histories</code>]
458458
[<code>--</code>[<code>no-</code>]<code>rerere-autoupdate</code>] [<code>-m</code> <em>&lt;msg&gt;</em>] [<code>-F</code> <em>&lt;file&gt;</em>]
@@ -650,6 +650,10 @@ <h2 id="_options">OPTIONS</h2>
650650
merge.</p>
651651
</div>
652652
</dd>
653+
<dt class="hdlist1"><code>--compact-summary</code></dt>
654+
<dd>
655+
<p>Show a compact-summary at the end of the merge.</p>
656+
</dd>
653657
<dt class="hdlist1"><code>--squash</code></dt>
654658
<dt class="hdlist1"><code>--no-squash</code></dt>
655659
<dd>
@@ -1509,8 +1513,33 @@ <h2 id="_configuration">CONFIGURATION</h2>
15091513
</dd>
15101514
<dt class="hdlist1"><code>merge.stat</code></dt>
15111515
<dd>
1512-
<p>Whether to print the diffstat between <code>ORIG_HEAD</code> and the merge result
1513-
at the end of the merge. True by default.</p>
1516+
<p>What, if anything, to print between <code>ORIG_HEAD</code> and the merge result
1517+
at the end of the merge. Possible values are:</p>
1518+
<div class="openblock">
1519+
<div class="content">
1520+
<div class="dlist">
1521+
<dl>
1522+
<dt class="hdlist1"><code>false</code></dt>
1523+
<dd>
1524+
<p>Show nothing.</p>
1525+
</dd>
1526+
<dt class="hdlist1"><code>true</code></dt>
1527+
<dd>
1528+
<p>Show <code>git</code> <code>diff</code> <code>--diffstat</code> <code>--summary</code> <code>ORIG_HEAD</code>.</p>
1529+
</dd>
1530+
<dt class="hdlist1"><code>compact</code></dt>
1531+
<dd>
1532+
<p>Show <code>git</code> <code>diff</code> <code>--compact-summary</code> <code>ORIG_HEAD</code>.</p>
1533+
</dd>
1534+
</dl>
1535+
</div>
1536+
</div>
1537+
</div>
1538+
<div class="paragraph">
1539+
<p>but any unrecognised value (e.g., a value added by a future version of
1540+
Git) is taken as <code>true</code> instead of triggering an error. Defaults to
1541+
<code>true</code>.</p>
1542+
</div>
15141543
</dd>
15151544
<dt class="hdlist1"><code>merge.autoStash</code></dt>
15161545
<dd>
@@ -1730,7 +1759,7 @@ <h2 id="_git">GIT</h2>
17301759
</div>
17311760
<div id="footer">
17321761
<div id="footer-text">
1733-
Last updated 2025-06-02 12:42:06 -0700
1762+
Last updated 2025-06-30 16:59:08 -0700
17341763
</div>
17351764
</div>
17361765
</body>

git-pull.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -687,6 +687,10 @@ <h3 id="_options_related_to_merging">Options related to merging</h3>
687687
merge.</p>
688688
</div>
689689
</dd>
690+
<dt class="hdlist1"><code>--compact-summary</code></dt>
691+
<dd>
692+
<p>Show a compact-summary at the end of the merge.</p>
693+
</dd>
690694
<dt class="hdlist1"><code>--squash</code></dt>
691695
<dt class="hdlist1"><code>--no-squash</code></dt>
692696
<dd>
@@ -1871,7 +1875,7 @@ <h2 id="_git">GIT</h2>
18711875
</div>
18721876
<div id="footer">
18731877
<div id="footer-text">
1874-
Last updated 2025-02-14 21:38:14 -0800
1878+
Last updated 2025-06-20 18:10:42 -0700
18751879
</div>
18761880
</div>
18771881
</body>

0 commit comments

Comments
 (0)