Autogenerated HTML docs for v2.51.0-178-g246296

Author: gitster

MyFirstContribution.adoc

@@ -917,10 +917,13 @@ Now you should be able to go and check out your newly created branch on GitHub.
 === Sending a PR to GitGitGadget
 
 In order to have your code tested and formatted for review, you need to start by
-opening a Pull Request against `gitgitgadget/git`. Head to
-https://github.com/gitgitgadget/git and open a PR either with the "New pull
-request" button or the convenient "Compare & pull request" button that may
-appear with the name of your newly pushed branch.
+opening a Pull Request against either `gitgitgadget/git` or `git/git`. Head to
+https://github.com/gitgitgadget/git or https://github.com/git/git and open a PR
+either with the "New pull request" button or the convenient "Compare & pull
+request" button that may appear with the name of your newly pushed branch.
+
+The differences between using `gitgitgadget/git` and `git/git` as your base can
+be found [here](https://gitgitgadget.github.io/#should-i-use-gitgitgadget-on-gitgitgadgets-git-fork-or-on-gits-github-mirror)
 
 Review the PR's title and description, as they're used by GitGitGadget
 respectively as the subject and body of the cover letter for your change. Refer

MyFirstContribution.html

@@ -1628,10 +1628,14 @@ <h3 id="upload-to-fork"><a class="anchor" href="#upload-to-fork"></a>Uploading t
 <h3 id="send-pr-ggg"><a class="anchor" href="#send-pr-ggg"></a>Sending a PR to GitGitGadget</h3>
 <div class="paragraph">
 <p>In order to have your code tested and formatted for review, you need to start by
-opening a Pull Request against <code>gitgitgadget/git</code>. Head to
-<a href="https://github.com/gitgitgadget/git" class="bare">https://github.com/gitgitgadget/git</a> and open a PR either with the "New pull
-request" button or the convenient "Compare &amp; pull request" button that may
-appear with the name of your newly pushed branch.</p>
+opening a Pull Request against either <code>gitgitgadget/git</code> or <code>git/git</code>. Head to
+<a href="https://github.com/gitgitgadget/git" class="bare">https://github.com/gitgitgadget/git</a> or <a href="https://github.com/git/git" class="bare">https://github.com/git/git</a> and open a PR
+either with the "New pull request" button or the convenient "Compare &amp; pull
+request" button that may appear with the name of your newly pushed branch.</p>
+</div>
+<div class="paragraph">
+<p>The differences between using <code>gitgitgadget/git</code> and <code>git/git</code> as your base can
+be found [here](<a href="https://gitgitgadget.github.io/#should-i-use-gitgitgadget-on-gitgitgadgets-git-fork-or-on-gits-github-mirror" class="bare">https://gitgitgadget.github.io/#should-i-use-gitgitgadget-on-gitgitgadgets-git-fork-or-on-gits-github-mirror</a>)</p>
 </div>
 <div class="paragraph">
 <p>Review the PR&#8217;s title and description, as they&#8217;re used by GitGitGadget
@@ -2269,7 +2273,7 @@ <h3 id="after-approval"><a class="anchor" href="#after-approval"></a>After Revie
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-08-29 10:28:43 -0700
+Last updated 2025-09-02 11:08:10 -0700
 </div>
 </div>
 </body>

RelNotes/2.52.0.adoc

@@ -125,6 +125,11 @@ including security updates, are included in this release.
    name.
    (merge bcb20dda83 js/doc-gitk-history later to maint).
 
+ * Update the instruction to use of GGG in the MyFirstContribution
+   document to say that a GitHub PR could be made against `git/git`
+   instead of `gitgitgadget/git`.
+   (merge 37001cdbc4 ds/doc-ggg-pr-fork-clarify later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge 823d537fa7 kh/doc-git-log-markup-fix later to maint).
    (merge cf7efa4f33 rj/t6137-cygwin-fix later to maint).
@@ -134,3 +139,7 @@ including security updates, are included in this release.
    (merge a60203a015 dk/t7005-editor-updates later to maint).
    (merge 7d4a5fef7d ds/doc-count-objects-fix later to maint).
    (merge 16684b6fae ps/reftable-libgit2-cleanup later to maint).
+   (merge f38786baa7 ja/asciidoc-doctor-verbatim-fixes later to maint).
+   (merge 374579c6d4 kh/doc-interpret-trailers-markup-fix later to maint).
+   (merge 44dce6541c kh/doc-config-typofix later to maint).
+   (merge 785628b173 js/doc-sending-patch-via-thunderbird later to maint).

git-config.html

@@ -7198,7 +7198,7 @@ <h3 id="_variables">Variables</h3>
 <p>During a merge, Git will automatically resolve as many conflicts as
 possible and write the <code>$MERGED</code> file containing conflict markers around
 any conflicts that it cannot resolve; <code>$LOCAL</code> and <code>$REMOTE</code> normally
-are the versions of the file from before Git`s conflict
+are the versions of the file from before Git&#8217;s conflict
 resolution. This flag causes <code>$LOCAL</code> and <code>$REMOTE</code> to be overwritten so
 that only the unresolved conflicts are presented to the merge tool. Can
 be configured per-tool via the <code>mergetool.</code><em>&lt;tool&gt;</em><code>.hideResolved</code>

git-diff-tree.html

@@ -2140,7 +2140,7 @@ <h2 id="_pretty_formats">PRETTY FORMATS</h2>
 <div class="ulist">
 <ul>
 <li>
-<p><code>prefix=</code><em>&lt;value&gt;</em>: Shown before the list of ref names.  Defaults to "&#160;+(+".</p>
+<p><code>prefix=</code><em>&lt;value&gt;</em>: Shown before the list of ref names.  Defaults to "&#160;(".</p>
 </li>
 <li>
 <p><code>suffix=</code><em>&lt;value&gt;</em>: Shown after the list of ref names.  Defaults to ")".</p>
@@ -2150,7 +2150,7 @@ <h2 id="_pretty_formats">PRETTY FORMATS</h2>
 </li>
 <li>
 <p><code>pointer=</code><em>&lt;value&gt;</em>: Shown between HEAD and the branch it points to, if any.
-Defaults to "&#160;+&#8594;+&#160;".</p>
+Defaults to "&#160;<code>-</code>&gt;&#160;".</p>
 </li>
 <li>
 <p><code>tag=</code><em>&lt;value&gt;</em>: Shown before tag names. Defaults to "<code>tag:</code>&#160;".</p>

git-format-patch.adoc

@@ -591,13 +591,19 @@ an external editor to keep Thunderbird from mangling the patches.
 Approach #1 (add-on)
 ^^^^^^^^^^^^^^^^^^^^
 
-Install the Toggle Word Wrap add-on that is available from
-https://addons.mozilla.org/thunderbird/addon/toggle-word-wrap/
-It adds a menu entry "Enable Word Wrap" in the composer's "Options" menu
+Install the Toggle Line Wrap add-on that is available from
+https://addons.thunderbird.net/thunderbird/addon/toggle-line-wrap
+It adds a button "Line Wrap" to the composer's toolbar
 that you can tick off. Now you can compose the message as you otherwise do
 (cut + paste, 'git format-patch' | 'git imap-send', etc), but you have to
 insert line breaks manually in any text that you type.
 
+As a bonus feature, the add-on can detect patch text in the composer
+and warns when line wrapping has not yet been turned off.
+
+The add-on requires a few tweaks of the advanced configuration
+(about:config). These are listed on the download page.
+
 Approach #2 (configuration)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 Three steps:

git-format-patch.html

@@ -1740,13 +1740,21 @@ <h3 id="_thunderbird">Thunderbird</h3>
 <div class="sect3">
 <h4 id="_approach_1_add_on">Approach #1 (add-on)</h4>
 <div class="paragraph">
-<p>Install the Toggle Word Wrap add-on that is available from
-<a href="https://addons.mozilla.org/thunderbird/addon/toggle-word-wrap/" class="bare">https://addons.mozilla.org/thunderbird/addon/toggle-word-wrap/</a>
-It adds a menu entry "Enable Word Wrap" in the composer&#8217;s "Options" menu
+<p>Install the Toggle Line Wrap add-on that is available from
+<a href="https://addons.thunderbird.net/thunderbird/addon/toggle-line-wrap" class="bare">https://addons.thunderbird.net/thunderbird/addon/toggle-line-wrap</a>
+It adds a button "Line Wrap" to the composer&#8217;s toolbar
 that you can tick off. Now you can compose the message as you otherwise do
 (cut + paste, <em>git format-patch</em> | <em>git imap-send</em>, etc), but you have to
 insert line breaks manually in any text that you type.</p>
 </div>
+<div class="paragraph">
+<p>As a bonus feature, the add-on can detect patch text in the composer
+and warns when line wrapping has not yet been turned off.</p>
+</div>
+<div class="paragraph">
+<p>The add-on requires a few tweaks of the advanced configuration
+(about:config). These are listed on the download page.</p>
+</div>
 </div>
 <div class="sect3">
 <h4 id="_approach_2_configuration">Approach #2 (configuration)</h4>
@@ -2034,7 +2042,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-08-25 14:46:08 -0700
+Last updated 2025-09-02 11:08:10 -0700
 </div>
 </div>
 </body>

git-interpret-trailers.adoc

@@ -142,8 +142,8 @@ OPTIONS
 	provided with '--if-exists' overrides the `trailer.ifExists` and any
 	applicable `trailer.<keyAlias>.ifExists` configuration variables
 	and applies to all '--trailer' options until the next occurrence of
-	'--if-exists' or '--no-if-exists'. Upon encountering '--no-if-exists, clear the
-	effect of any previous use of '--if-exists, such that the relevant configuration
+	'--if-exists' or '--no-if-exists'. Upon encountering '--no-if-exists', clear the
+	effect of any previous use of '--if-exists', such that the relevant configuration
 	variables are no longer overridden. Possible actions are `addIfDifferent`,
 	`addIfDifferentNeighbor`, `add`, `replace` and `doNothing`.
 
@@ -154,8 +154,8 @@ OPTIONS
 	provided with '--if-missing' overrides the `trailer.ifMissing` and any
 	applicable `trailer.<keyAlias>.ifMissing` configuration variables
 	and applies to all '--trailer' options until the next occurrence of
-	'--if-missing' or '--no-if-missing'. Upon encountering '--no-if-missing,
-	clear the effect of any previous use of '--if-missing, such that the relevant
+	'--if-missing' or '--no-if-missing'. Upon encountering '--no-if-missing',
+	clear the effect of any previous use of '--if-missing', such that the relevant
 	configuration variables are no longer overridden. Possible actions are `doNothing`
 	or `add`.
 

git-interpret-trailers.html

@@ -617,8 +617,8 @@ <h2 id="_options">OPTIONS</h2>
 provided with <em>--if-exists</em> overrides the <code>trailer.ifExists</code> and any
 applicable <code>trailer.</code><em>&lt;keyAlias&gt;</em><code>.ifExists</code> configuration variables
 and applies to all <em>--trailer</em> options until the next occurrence of
-<em>--if-exists</em> or <em>--no-if-exists</em>. Upon encountering '--no-if-exists, clear the
-effect of any previous use of '--if-exists, such that the relevant configuration
+<em>--if-exists</em> or <em>--no-if-exists</em>. Upon encountering <em>--no-if-exists</em>, clear the
+effect of any previous use of <em>--if-exists</em>, such that the relevant configuration
 variables are no longer overridden. Possible actions are <code>addIfDifferent</code>,
 <code>addIfDifferentNeighbor</code>, <code>add</code>, <code>replace</code> and <code>doNothing</code>.</p>
 </dd>
@@ -630,8 +630,8 @@ <h2 id="_options">OPTIONS</h2>
 provided with <em>--if-missing</em> overrides the <code>trailer.ifMissing</code> and any
 applicable <code>trailer.</code><em>&lt;keyAlias&gt;</em><code>.ifMissing</code> configuration variables
 and applies to all <em>--trailer</em> options until the next occurrence of
-<em>--if-missing</em> or <em>--no-if-missing</em>. Upon encountering '--no-if-missing,
-clear the effect of any previous use of '--if-missing, such that the relevant
+<em>--if-missing</em> or <em>--no-if-missing</em>. Upon encountering <em>--no-if-missing</em>,
+clear the effect of any previous use of <em>--if-missing</em>, such that the relevant
 configuration variables are no longer overridden. Possible actions are <code>doNothing</code>
 or <code>add</code>.</p>
 </dd>
@@ -1085,7 +1085,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-06-20 18:10:42 -0700
+Last updated 2025-09-02 11:08:10 -0700
 </div>
 </div>
 </body>

git-log.html

@@ -2470,7 +2470,7 @@ <h2 id="_pretty_formats">PRETTY FORMATS</h2>
 <div class="ulist">
 <ul>
 <li>
-<p><code>prefix=</code><em>&lt;value&gt;</em>: Shown before the list of ref names.  Defaults to "&#160;+(+".</p>
+<p><code>prefix=</code><em>&lt;value&gt;</em>: Shown before the list of ref names.  Defaults to "&#160;(".</p>
 </li>
 <li>
 <p><code>suffix=</code><em>&lt;value&gt;</em>: Shown after the list of ref names.  Defaults to ")".</p>
@@ -2480,7 +2480,7 @@ <h2 id="_pretty_formats">PRETTY FORMATS</h2>
 </li>
 <li>
 <p><code>pointer=</code><em>&lt;value&gt;</em>: Shown between HEAD and the branch it points to, if any.
-Defaults to "&#160;+&#8594;+&#160;".</p>
+Defaults to "&#160;<code>-</code>&gt;&#160;".</p>
 </li>
 <li>
 <p><code>tag=</code><em>&lt;value&gt;</em>: Shown before tag names. Defaults to "<code>tag:</code>&#160;".</p>