Autogenerated HTML docs for v2.51.0-178-g246296
diff --git a/MyFirstContribution.adoc b/MyFirstContribution.adoc
index d786176..02ba8ba 100644
--- a/MyFirstContribution.adoc
+++ b/MyFirstContribution.adoc
@@ -917,10 +917,13 @@
=== 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
diff --git a/MyFirstContribution.html b/MyFirstContribution.html
index 5f0bb80..377aa68 100644
--- a/MyFirstContribution.html
+++ b/MyFirstContribution.html
@@ -1628,10 +1628,14 @@
<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 & 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 & 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’s title and description, as they’re used by GitGitGadget
@@ -2269,7 +2273,7 @@
</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>
diff --git a/RelNotes/2.52.0.adoc b/RelNotes/2.52.0.adoc
index 4e8dbd0..fa72515 100644
--- a/RelNotes/2.52.0.adoc
+++ b/RelNotes/2.52.0.adoc
@@ -125,6 +125,11 @@
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 @@
(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).
diff --git a/git-config.html b/git-config.html
index e45ecba..ef11d04 100644
--- a/git-config.html
+++ b/git-config.html
@@ -7198,7 +7198,7 @@
<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’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><tool></em><code>.hideResolved</code>
diff --git a/git-diff-tree.html b/git-diff-tree.html
index 60a14a8..7ac6f3a 100644
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -2140,7 +2140,7 @@
<div class="ulist">
<ul>
<li>
-<p><code>prefix=</code><em><value></em>: Shown before the list of ref names. Defaults to " +(+".</p>
+<p><code>prefix=</code><em><value></em>: Shown before the list of ref names. Defaults to " (".</p>
</li>
<li>
<p><code>suffix=</code><em><value></em>: Shown after the list of ref names. Defaults to ")".</p>
@@ -2150,7 +2150,7 @@
</li>
<li>
<p><code>pointer=</code><em><value></em>: Shown between HEAD and the branch it points to, if any.
-Defaults to " +→+ ".</p>
+Defaults to " <code>-</code>> ".</p>
</li>
<li>
<p><code>tag=</code><em><value></em>: Shown before tag names. Defaults to "<code>tag:</code> ".</p>
diff --git a/git-format-patch.adoc b/git-format-patch.adoc
index 048d1b9..9a7807c 100644
--- a/git-format-patch.adoc
+++ b/git-format-patch.adoc
@@ -591,13 +591,19 @@
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:
diff --git a/git-format-patch.html b/git-format-patch.html
index 62c09b1..54c20a2 100644
--- a/git-format-patch.html
+++ b/git-format-patch.html
@@ -1740,13 +1740,21 @@
<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’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’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 @@
</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>
diff --git a/git-interpret-trailers.adoc b/git-interpret-trailers.adoc
index 82c8780..fd335fe 100644
--- a/git-interpret-trailers.adoc
+++ b/git-interpret-trailers.adoc
@@ -142,8 +142,8 @@
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 @@
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`.
diff --git a/git-interpret-trailers.html b/git-interpret-trailers.html
index 35c4b97..0ea53f0 100644
--- a/git-interpret-trailers.html
+++ b/git-interpret-trailers.html
@@ -617,8 +617,8 @@
provided with <em>--if-exists</em> overrides the <code>trailer.ifExists</code> and any
applicable <code>trailer.</code><em><keyAlias></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 @@
provided with <em>--if-missing</em> overrides the <code>trailer.ifMissing</code> and any
applicable <code>trailer.</code><em><keyAlias></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 @@
</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>
diff --git a/git-log.html b/git-log.html
index 7a381d2..c20cdd9 100644
--- a/git-log.html
+++ b/git-log.html
@@ -2470,7 +2470,7 @@
<div class="ulist">
<ul>
<li>
-<p><code>prefix=</code><em><value></em>: Shown before the list of ref names. Defaults to " +(+".</p>
+<p><code>prefix=</code><em><value></em>: Shown before the list of ref names. Defaults to " (".</p>
</li>
<li>
<p><code>suffix=</code><em><value></em>: Shown after the list of ref names. Defaults to ")".</p>
@@ -2480,7 +2480,7 @@
</li>
<li>
<p><code>pointer=</code><em><value></em>: Shown between HEAD and the branch it points to, if any.
-Defaults to " +→+ ".</p>
+Defaults to " <code>-</code>> ".</p>
</li>
<li>
<p><code>tag=</code><em><value></em>: Shown before tag names. Defaults to "<code>tag:</code> ".</p>
diff --git a/git-mergetool.html b/git-mergetool.html
index 3440c74..19e466f 100644
--- a/git-mergetool.html
+++ b/git-mergetool.html
@@ -649,7 +649,7 @@
<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’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><tool></em><code>.hideResolved</code>
diff --git a/git-rev-list.html b/git-rev-list.html
index a037a99..330896a 100644
--- a/git-rev-list.html
+++ b/git-rev-list.html
@@ -2606,7 +2606,7 @@
<div class="ulist">
<ul>
<li>
-<p><code>prefix=</code><em><value></em>: Shown before the list of ref names. Defaults to " +(+".</p>
+<p><code>prefix=</code><em><value></em>: Shown before the list of ref names. Defaults to " (".</p>
</li>
<li>
<p><code>suffix=</code><em><value></em>: Shown after the list of ref names. Defaults to ")".</p>
@@ -2616,7 +2616,7 @@
</li>
<li>
<p><code>pointer=</code><em><value></em>: Shown between HEAD and the branch it points to, if any.
-Defaults to " +→+ ".</p>
+Defaults to " <code>-</code>> ".</p>
</li>
<li>
<p><code>tag=</code><em><value></em>: Shown before tag names. Defaults to "<code>tag:</code> ".</p>
diff --git a/git-show.html b/git-show.html
index a58ab04..6dca955 100644
--- a/git-show.html
+++ b/git-show.html
@@ -1100,7 +1100,7 @@
<div class="ulist">
<ul>
<li>
-<p><code>prefix=</code><em><value></em>: Shown before the list of ref names. Defaults to " +(+".</p>
+<p><code>prefix=</code><em><value></em>: Shown before the list of ref names. Defaults to " (".</p>
</li>
<li>
<p><code>suffix=</code><em><value></em>: Shown after the list of ref names. Defaults to ")".</p>
@@ -1110,7 +1110,7 @@
</li>
<li>
<p><code>pointer=</code><em><value></em>: Shown between HEAD and the branch it points to, if any.
-Defaults to " +→+ ".</p>
+Defaults to " <code>-</code>> ".</p>
</li>
<li>
<p><code>tag=</code><em><value></em>: Shown before tag names. Defaults to "<code>tag:</code> ".</p>
diff --git a/pretty-formats.adoc b/pretty-formats.adoc
index 9ed0417..618ddc4 100644
--- a/pretty-formats.adoc
+++ b/pretty-formats.adoc
@@ -233,11 +233,11 @@
literal formatting codes. These must be used for commas (`%x2C`) and closing
parentheses (`%x29`), due to their role in the option syntax.
+
-** `prefix=<value>`: Shown before the list of ref names. Defaults to "{nbsp}+(+".
+** `prefix=<value>`: Shown before the list of ref names. Defaults to "{nbsp}++(++".
** `suffix=<value>`: Shown after the list of ref names. Defaults to "+)+".
** `separator=<value>`: Shown between ref names. Defaults to "+,+{nbsp}".
** `pointer=<value>`: Shown between HEAD and the branch it points to, if any.
- Defaults to "{nbsp}+->+{nbsp}".
+ Defaults to "{nbsp}++->++{nbsp}".
** `tag=<value>`: Shown before tag names. Defaults to "`tag:`{nbsp}".
+
