Autogenerated HTML docs for v2.48.1-431-g5a526e

Author: gitster

RelNotes/2.49.0.adoc

@@ -35,6 +35,9 @@ UI, Workflows & Features
 
  * Comes with an updated "gitk".
 
+ * The documentation of "git commit" and "git rebase" now refer to
+   commit titles as such, not "subject".
+
 
 Performance, Internal Implementation, Development Support etc.
 --------------------------------------------------------------
@@ -204,6 +207,19 @@ Fixes since v2.48
  * A thunderbird helper script lost its bashism.
    (merge 59d26bd961 bc/contrib-thunderbird-patch-inline-fix later to maint).
 
+ * The -G/-S options to the "diff" family of commands caused us to hit
+   a BUG() when they get no values; they have been corrected.
+   (merge a620046b29 bc/diff-reject-empty-arg-to-pickaxe later to maint).
+
+ * "git merge-tree --stdin" has been improved (including a workaround
+   for a deadlock).
+   (merge 6a9ae81015 pw/merge-tree-stdin-deadlock-fix later to maint).
+
+ * Correct the default target in Documentation/Makefile, and
+   future-proof all Makefiles from similar breakages by declaring the
+   default target (which happens to be "all") upfront.
+   (merge 5309c1e9fb ad/set-default-target-in-makefiles later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge ddb5287894 jk/t7407-use-test-grep later to maint).
    (merge 21e1b44865 aj/difftool-config-doc-fix later to maint).

git-commit.adoc

@@ -98,16 +98,16 @@ OPTIONS
 	replaces the log message of _<commit>_ with its own log message
 	but makes no changes to the content of _<commit>_.
 +
-The commit created by plain `--fixup=<commit>` has a subject
-composed of "fixup!" followed by the subject line from _<commit>_,
+The commit created by plain `--fixup=<commit>` has a title
+composed of "fixup!" followed by the title of _<commit>_,
 and is recognized specially by `git rebase --autosquash`. The `-m`
 option may be used to supplement the log message of the created
 commit, but the additional commentary will be thrown away once the
 "fixup!" commit is squashed into _<commit>_ by
 `git rebase --autosquash`.
 +
 The commit created by `--fixup=amend:<commit>` is similar but its
-subject is instead prefixed with "amend!". The log message of
+title is instead prefixed with "amend!". The log message of
 _<commit>_ is copied into the log message of the "amend!" commit and
 opened in an editor so it can be refined. When `git rebase
 --autosquash` squashes the "amend!" commit into _<commit>_, the
@@ -128,7 +128,7 @@ See linkgit:git-rebase[1] for details.
 
 `--squash=<commit>`::
 	Construct a commit message for use with `git rebase --autosquash`.
-	The commit message subject line is taken from the specified
+	The commit message title is taken from the specified
 	commit with a prefix of "squash! ".  Can be used with additional
 	commit message options (`-m`/`-c`/`-C`/`-F`). See
 	linkgit:git-rebase[1] for details.

git-commit.html

@@ -566,8 +566,8 @@ <h2 id="_options">OPTIONS</h2>
 replaces the log message of <em>&lt;commit&gt;</em> with its own log message
 but makes no changes to the content of <em>&lt;commit&gt;</em>.</p>
 <div class="paragraph">
-<p>The commit created by plain <code>--fixup=</code><em>&lt;commit&gt;</em> has a subject
-composed of "fixup!" followed by the subject line from <em>&lt;commit&gt;</em>,
+<p>The commit created by plain <code>--fixup=</code><em>&lt;commit&gt;</em> has a title
+composed of "fixup!" followed by the title of <em>&lt;commit&gt;</em>,
 and is recognized specially by <code>git</code> <code>rebase</code> <code>--autosquash</code>. The <code>-m</code>
 option may be used to supplement the log message of the created
 commit, but the additional commentary will be thrown away once the
@@ -576,7 +576,7 @@ <h2 id="_options">OPTIONS</h2>
 </div>
 <div class="paragraph">
 <p>The commit created by <code>--fixup=amend:</code><em>&lt;commit&gt;</em> is similar but its
-subject is instead prefixed with "amend!". The log message of
+title is instead prefixed with "amend!". The log message of
 <em>&lt;commit&gt;</em> is copied into the log message of the "amend!" commit and
 opened in an editor so it can be refined. When <code>git</code> <code>rebase</code>
 <code>--autosquash</code> squashes the "amend!" commit into <em>&lt;commit&gt;</em>, the
@@ -601,7 +601,7 @@ <h2 id="_options">OPTIONS</h2>
 <dt class="hdlist1"><code>--squash=</code><em>&lt;commit&gt;</em></dt>
 <dd>
 <p>Construct a commit message for use with <code>git</code> <code>rebase</code> <code>--autosquash</code>.
-The commit message subject line is taken from the specified
+The commit message title is taken from the specified
 commit with a prefix of "squash! ".  Can be used with additional
 commit message options (<code>-m</code>/<code>-c</code>/<code>-C</code>/<code>-F</code>). See
 <a href="git-rebase.html">git-rebase(1)</a> for details.</p>
@@ -1406,7 +1406,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-02-25 15:22:04 -0800
 </div>
 </div>
 </body>

git-merge-tree.adoc

@@ -40,11 +40,17 @@ After the merge completes, a new toplevel tree object is created.  See
 OPTIONS
 -------
 
+--stdin::
+	Read the commits to merge from the standard input rather than
+	the command-line. See <<INPUT,INPUT FORMAT>> below for more
+	information.  Implies `-z`.
+
 -z::
 	Do not quote filenames in the <Conflicted file info> section,
 	and end each filename with a NUL character rather than
 	newline.  Also begin the messages section with a NUL character
-	instead of a newline.  See <<OUTPUT>> below for more information.
+	instead of a newline.  See <<OUTPUT,OUTPUT>> below for more
+	information.
 
 --name-only::
 	In the Conflicted file info section, instead of writing a list
@@ -116,8 +122,6 @@ This is an integer status followed by a NUL character.  The integer status is:
 
      0: merge had conflicts
      1: merge was clean
-     <0: something prevented the merge from running (e.g. access to repository
-	 objects denied by filesystem)
 
 [[OIDTLT]]
 OID of toplevel tree
@@ -235,6 +239,7 @@ with linkgit:git-merge[1]:
   * any messages that would have been printed to stdout (the
     <<IM,Informational messages>>)
 
+[[INPUT]]
 INPUT FORMAT
 ------------
 'git merge-tree --stdin' input format is fully text based. Each line

git-merge-tree.html

@@ -505,12 +505,19 @@ <h2 id="_options">OPTIONS</h2>
 <div class="sectionbody">
 <div class="dlist">
 <dl>
+<dt class="hdlist1">--stdin</dt>
+<dd>
+<p>Read the commits to merge from the standard input rather than
+the command-line. See <a href="#INPUT">INPUT FORMAT</a> below for more
+information.  Implies <code>-z</code>.</p>
+</dd>
 <dt class="hdlist1">-z</dt>
 <dd>
 <p>Do not quote filenames in the &lt;Conflicted file info&gt; section,
 and end each filename with a NUL character rather than
 newline.  Also begin the messages section with a NUL character
-instead of a newline.  See <a href="#OUTPUT">OUTPUT</a> below for more information.</p>
+instead of a newline.  See <a href="#OUTPUT">OUTPUT</a> below for more
+information.</p>
 </dd>
 <dt class="hdlist1">--name-only</dt>
 <dd>
@@ -603,10 +610,8 @@ <h3 id="MS">Merge status</h3>
 </div>
 <div class="literalblock">
 <div class="content">
-<pre>   0: merge had conflicts
-   1: merge was clean
-   &lt;0: something prevented the merge from running (e.g. access to repository
-objects denied by filesystem)</pre>
+<pre>0: merge had conflicts
+1: merge was clean</pre>
 </div>
 </div>
 </div>
@@ -788,7 +793,7 @@ <h2 id="_usage_notes">USAGE NOTES</h2>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_input_format">INPUT FORMAT</h2>
+<h2 id="INPUT">INPUT FORMAT</h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p><em>git merge-tree --stdin</em> input format is fully text based. Each line
@@ -909,7 +914,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-02-25 15:22:04 -0800
 </div>
 </div>
 </body>

git-rebase.adoc

@@ -599,11 +599,11 @@ See also INCOMPATIBLE OPTIONS below.
 --no-autosquash::
 	Automatically squash commits with specially formatted messages into
 	previous commits being rebased.  If a commit message starts with
-	"squash! ", "fixup! " or "amend! ", the remainder of the subject line
+	"squash! ", "fixup! " or "amend! ", the remainder of the title
 	is taken as a commit specifier, which matches a previous commit if it
-	matches the subject line or the hash of that commit.  If no commit
+	matches the title or the hash of that commit.  If no commit
 	matches fully, matches of the specifier with the start of commit
-	subjects are considered.
+	titles are considered.
 +
 In the rebase todo list, the actions of squash, fixup and amend commits are
 changed from `pick` to `squash`, `fixup` or `fixup -C`, respectively, and they
@@ -613,7 +613,7 @@ be used to review and edit the todo list before proceeding.
 The recommended way to create commits with squash markers is by using the
 `--squash`, `--fixup`, `--fixup=amend:` or `--fixup=reword:` options of
 linkgit:git-commit[1], which take the target commit as an argument and
-automatically fill in the subject line of the new commit from that.
+automatically fill in the title of the new commit from that.
 +
 Setting configuration variable `rebase.autoSquash` to true enables
 auto-squashing by default for interactive rebase.  The `--no-autosquash`

git-rebase.html

@@ -1227,11 +1227,11 @@ <h2 id="_options">OPTIONS</h2>
 <dd>
 <p>Automatically squash commits with specially formatted messages into
 previous commits being rebased.  If a commit message starts with
-"squash! ", "fixup! " or "amend! ", the remainder of the subject line
+"squash! ", "fixup! " or "amend! ", the remainder of the title
 is taken as a commit specifier, which matches a previous commit if it
-matches the subject line or the hash of that commit.  If no commit
+matches the title or the hash of that commit.  If no commit
 matches fully, matches of the specifier with the start of commit
-subjects are considered.</p>
+titles are considered.</p>
 <div class="paragraph">
 <p>In the rebase todo list, the actions of squash, fixup and amend commits are
 changed from <code>pick</code> to <code>squash</code>, <code>fixup</code> or <code>fixup</code> <code>-C</code>, respectively, and they
@@ -1242,7 +1242,7 @@ <h2 id="_options">OPTIONS</h2>
 <p>The recommended way to create commits with squash markers is by using the
 <code>--squash</code>, <code>--fixup</code>, <code>--fixup=amend:</code> or <code>--fixup=reword:</code> options of
 <a href="git-commit.html">git-commit(1)</a>, which take the target commit as an argument and
-automatically fill in the subject line of the new commit from that.</p>
+automatically fill in the title of the new commit from that.</p>
 </div>
 <div class="paragraph">
 <p>Setting configuration variable <code>rebase.autoSquash</code> to true enables
@@ -2484,7 +2484,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-02-25 15:22:04 -0800
 </div>
 </div>
 </body>