Autogenerated HTML docs for v2.37.0-rc0-54-gb4eda

20 files changed, 133 insertions, 60 deletions

diff --git a/RelNotes/2.37.0.txt b/RelNotes/2.37.0.txt
index 8f1ff3a59..f1b93f3c5 100644
--- a/RelNotes/2.37.0.txt
+++ b/RelNotes/2.37.0.txt
@@ -54,8 +54,19 @@ UI, Workflows & Features
 
  * Update the doctype written in gitweb output to xhtml5.
 
- * The "fetch.credentialsInUrl" configuration variable controls what
-   happens when a URL with embedded login credential is used.
+ * The "transfer.credentialsInURL" configuration variable controls what
+   happens when a URL with embedded login credential is used on either
+   "fetch" or "push". Credentials are currently only detected in
+   `remote.<name>.url` config, not `remote.<name>.pushurl`.
+
+ * "git revert" learns "--reference" option to use more human-readable
+   reference to the commit it reverts in the message template it
+   prepares for the user.
+
+ * Various error messages that talk about the removal of
+   "--preserve-merges" in "rebase" have been strengthened, and "rebase
+   --abort" learned to get out of a state that was left by an earlier
+   use of the option.
 
 
 Performance, Internal Implementation, Development Support etc.
@@ -80,14 +91,15 @@ Performance, Internal Implementation, Development Support etc.
 
  * A workflow change for translators are being proposed.  git.pot is
    no longer version controlled and it is local responsibility of
-   translaters to generate it.
+   translators to generate it.
 
  * Plug the memory leaks from the trickiest API of all, the revision
    walker.
 
  * Rename .env_array member to .env in the child_process structure.
 
- * More fsmonitor--daemon.
+  * The fsmonitor--daemon handles even more corner cases when
+    watching filesystem events.
 
  * A new bug() and BUG_if_bug() API is introduced to make it easier to
    uniformly log "detect multiple bugs and abort in the end" pattern.
@@ -133,7 +145,7 @@ Fixes since v2.36
    (merge 08bdd3a185 jc/cocci-xstrdup-or-null-fix later to maint).
 
  * The path taken by "git multi-pack-index" command from the end user
-   was compared with path internally prepared by the tool withut first
+   was compared with path internally prepared by the tool without first
    normalizing, which lead to duplicated paths not being noticed,
    which has been corrected.
    (merge 11f9e8de3d ds/midx-normalize-pathname-before-comparison later to maint).
@@ -163,7 +175,7 @@ Fixes since v2.36
    is given in "git status" not to use the break-rewrite heuristics.
    (merge 84792322ed rs/commit-summary-wo-break-rewrite later to maint).
 
- * Update a few end-user facing messages around eol conversion.
+ * Update a few end-user facing messages around EOL conversion.
    (merge c970d30c2c ah/convert-warning-message later to maint).
 
  * Trace2 documentation updates.
@@ -256,7 +268,7 @@ Fixes since v2.36
    has been corrected.
    (merge b02fdbc80a jc/all-negative-pathspec later to maint).
 
- * With a more targetted workaround in http.c in another topic, we may
+ * With a more targeted workaround in http.c in another topic, we may
    be able to lift this blanket "GCC12 dangling-pointer warning is
    broken and unsalvageable" workaround.
    (merge 419141e495 cb/buggy-gcc-12-workaround later to maint).
@@ -297,6 +309,9 @@ Fixes since v2.36
  * Use-after-free (with another forget-to-free) fix.
    (merge 323822c72b ab/remote-free-fix later to maint).
 
+ * Remove a coccinelle rule that is no longer relevant.
+   (merge b1299de4a1 jc/cocci-cleanup later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge e6b2582da3 cm/reftable-0-length-memset later to maint).
    (merge 0b75e5bf22 ab/misc-cleanup later to maint).
@@ -320,3 +335,4 @@ Fixes since v2.36
    (merge 8c49d704ef fh/transport-push-leakfix later to maint).
    (merge 1d232d38bd tl/ls-tree-oid-only later to maint).
    (merge db7961e6a6 gc/document-config-worktree-scope later to maint).
+   (merge ce18a30bb7 fs/ssh-default-key-command-doc later to maint).
diff --git a/git-config.html b/git-config.html
index 870d3e54e..88223b04c 100644
--- a/git-config.html
+++ b/git-config.html
@@ -5435,38 +5435,6 @@ fetch.writeCommitGraph
 </p>

 </dd>

 <dt class="hdlist1">

-fetch.credentialsInUrl

-</dt>

-<dd>

-<p>

-        A URL can contain plaintext credentials in the form

-        <code>&lt;protocol&gt;://&lt;user&gt;:&lt;password&gt;@&lt;domain&gt;/&lt;path&gt;</code>. Using such URLs

-        is not recommended as it exposes the password in multiple ways,

-        including Git storing the URL as plaintext in the repository config.

-        The <code>fetch.credentialsInUrl</code> option provides instruction for how Git

-        should react to seeing such a URL, with these values:

-</p>

-<div class="ulist"><ul>

-<li>

-<p>

-<code>allow</code> (default): Git will proceed with its activity without warning.

-</p>

-</li>

-<li>

-<p>

-<code>warn</code>: Git will write a warning message to <code>stderr</code> when parsing a URL

-  with a plaintext credential.

-</p>

-</li>

-<li>

-<p>

-<code>die</code>: Git will write a failure message to <code>stderr</code> when parsing a URL

-  with a plaintext credential.

-</p>

-</li>

-</ul></div>

-</dd>

-<dt class="hdlist1">

 format.attach

 </dt>

 <dd>

@@ -6308,9 +6276,12 @@ gpg.ssh.defaultKeyCommand
 <dd>

 <p>

         This command that will be run when user.signingkey is not set and a ssh

-        signature is requested. On successful exit a valid ssh public key is

-        expected in the first line of its output. To automatically use the first

-        available key from your ssh-agent set this to "ssh-add -L".

+        signature is requested. On successful exit a valid ssh public key

+        prefixed with <code>key::</code> is expected in the first line of its output.

+        This allows for a script doing a dynamic lookup of the correct public

+        key when it is impractical to statically configure <code>user.signingKey</code>.

+        For example when keys or SSH Certificates are rotated frequently or

+        selection of the right key depends on external factors unknown to git.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -7047,7 +7018,7 @@ http.schannelUseSSLCAInfo
 </p>

 </dd>

 <dt class="hdlist1">

-http.pinnedpubkey

+http.pinnedPubkey

 </dt>

 <dd>

 <p>

@@ -10698,6 +10669,70 @@ trace2.maxFiles
 </p>

 </dd>

 <dt class="hdlist1">

+transfer.credentialsInUrl

+</dt>

+<dd>

+<p>

+        A configured URL can contain plaintext credentials in the form

+        <code>&lt;protocol&gt;://&lt;user&gt;:&lt;password&gt;@&lt;domain&gt;/&lt;path&gt;</code>. You may want

+        to warn or forbid the use of such configuration (in favor of

+        using <a href="git-credential.html">git-credential(1)</a>). This will be used on

+        <a href="git-clone.html">git-clone(1)</a>, <a href="git-fetch.html">git-fetch(1)</a>, <a href="git-push.html">git-push(1)</a>,

+        and any other direct use of the configured URL.

+</p>

+<div class="paragraph"><p>Note that this is currently limited to detecting credentials in

+<code>remote.&lt;name&gt;.url</code> configuration, it won&#8217;t detect credentials in

+<code>remote.&lt;name&gt;.pushurl</code> configuration.</p></div>

+<div class="paragraph"><p>You might want to enable this to prevent inadvertent credentials

+exposure, e.g. because:</p></div>

+<div class="ulist"><ul>

+<li>

+<p>

+The OS or system where you&#8217;re running git may not provide way way or

+  otherwise allow you to configure the permissions of the

+  configuration file where the username and/or password are stored.

+</p>

+</li>

+<li>

+<p>

+Even if it does, having such data stored "at rest" might expose you

+  in other ways, e.g. a backup process might copy the data to another

+  system.

+</p>

+</li>

+<li>

+<p>

+The git programs will pass the full URL to one another as arguments

+  on the command-line, meaning the credentials will be exposed to oher

+  users on OS&#8217;s or systems that allow other users to see the full

+  process list of other users. On linux the "hidepid" setting

+  documented in procfs(5) allows for configuring this behavior.

+</p>

+<div class="paragraph"><p>If such concerns don&#8217;t apply to you then you probably don&#8217;t need to be

+concerned about credentials exposure due to storing that sensitive

+data in git&#8217;s configuration files. If you do want to use this, set

+<code>transfer.credentialsInUrl</code> to one of these values:</p></div>

+</li>

+<li>

+<p>

+<code>allow</code> (default): Git will proceed with its activity without warning.

+</p>

+</li>

+<li>

+<p>

+<code>warn</code>: Git will write a warning message to <code>stderr</code> when parsing a URL

+  with a plaintext credential.

+</p>

+</li>

+<li>

+<p>

+<code>die</code>: Git will write a failure message to <code>stderr</code> when parsing a URL

+  with a plaintext credential.

+</p>

+</li>

+</ul></div>

+</dd>

+<dt class="hdlist1">

 transfer.fsckObjects

 </dt>

 <dd>

diff --git a/git-revert.html b/git-revert.html
index b4ee4d700..befc1c15b 100644
--- a/git-revert.html
+++ b/git-revert.html
@@ -930,6 +930,19 @@ effect to your index in a row.</p></div>
         result of auto-conflict resolution if possible.

 </p>

 </dd>

+<dt class="hdlist1">

+--reference

+</dt>

+<dd>

+<p>

+        Instead of starting the body of the log message with "This

+        reverts &lt;full object name of the commit being reverted&gt;.",

+        refer to the commit using "--pretty=reference" format

+        (cf. <a href="git-log.html">git-log(1)</a>).  The <code>revert.reference</code>

+        configuration variable can be used to enable this option by

+        default.

+</p>

+</dd>

 </dl></div>

 </div>

 </div>

@@ -1022,7 +1035,7 @@ effect to your index in a row.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-11-02 18:01:42 PST

+ 2022-06-17 10:57:33 PDT

 </div>

 </div>

 </body>

diff --git a/git-revert.txt b/git-revert.txt
index bb92a4a45..8463fe9cf 100644
--- a/git-revert.txt
+++ b/git-revert.txt
@@ -117,6 +117,15 @@ effect to your index in a row.
 	Allow the rerere mechanism to update the index with the
 	result of auto-conflict resolution if possible.
 
+--reference::
+	Instead of starting the body of the log message with "This
+	reverts <full object name of the commit being reverted>.",
+	refer to the commit using "--pretty=reference" format
+	(cf. linkgit:git-log[1]).  The `revert.reference`
+	configuration variable can be used to enable this option by
+	default.
+
+
 SEQUENCER SUBCOMMANDS
 ---------------------
 include::sequencer.txt[]
diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html
index b0de7a8ff..303455dd6 100644
--- a/howto/coordinate-embargoed-releases.html
+++ b/howto/coordinate-embargoed-releases.html
@@ -873,7 +873,7 @@ Thanks,
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2022-06-13 16:41:57 PDT

+ 2022-06-17 10:58:05 PDT

 </div>

 </div>

 </body>

diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index 735e3034d..6ee70c79b 100644
--- a/howto/keep-canonical-history-correct.html
+++ b/howto/keep-canonical-history-correct.html
@@ -938,7 +938,7 @@ tip of your <em>master</em> again and redo the two merges:</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2022-06-13 16:41:57 PDT

+ 2022-06-17 10:58:05 PDT

 </div>

 </div>

 </body>

diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index 6aa7631d0..27bc9c10c 100644
--- a/howto/maintain-git.html
+++ b/howto/maintain-git.html
@@ -1469,7 +1469,7 @@ $ git update-ref -d $mf/ai/topic</code></pre>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2022-06-13 16:41:57 PDT

+ 2022-06-17 10:58:05 PDT

 </div>

 </div>

 </body>

diff --git a/howto/new-command.html b/howto/new-command.html
index 8dfd3123e..0d01983b7 100644
--- a/howto/new-command.html
+++ b/howto/new-command.html
@@ -863,7 +863,7 @@ letter [PATCH 0/n].
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2022-06-13 16:41:55 PDT

+ 2022-06-17 10:58:03 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index f12318947..75f6dca3c 100644
--- a/howto/rebase-from-internal-branch.html
+++ b/howto/rebase-from-internal-branch.html
@@ -895,7 +895,7 @@ the #1' commit.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2022-06-13 16:41:57 PDT

+ 2022-06-17 10:58:05 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index c09f559ba..83c6fb7a4 100644
--- a/howto/rebuild-from-update-hook.html
+++ b/howto/rebuild-from-update-hook.html
@@ -847,7 +847,7 @@ This is still crude and does not protect against simultaneous
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2022-06-13 16:41:57 PDT

+ 2022-06-17 10:58:05 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index cbcd3fd8a..0af088153 100644
--- a/howto/recover-corrupted-blob-object.html
+++ b/howto/recover-corrupted-blob-object.html
@@ -880,7 +880,7 @@ thing.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2022-06-13 16:41:57 PDT

+ 2022-06-17 10:58:05 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index bdebc49be..4f909c629 100644
--- a/howto/recover-corrupted-object-harder.html
+++ b/howto/recover-corrupted-object-harder.html
@@ -1189,7 +1189,7 @@ int main(int argc, char **argv)
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2022-06-13 16:41:57 PDT

+ 2022-06-17 10:58:05 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index 4aeb319eb..8dc7eaeaf 100644
--- a/howto/revert-a-faulty-merge.html
+++ b/howto/revert-a-faulty-merge.html
@@ -1025,7 +1025,7 @@ P---o---o---M---x---x---W---x---M2
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2022-06-13 16:41:57 PDT

+ 2022-06-17 10:58:04 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index fa781b0e2..aa2cec8c6 100644
--- a/howto/revert-branch-rebase.html
+++ b/howto/revert-branch-rebase.html
@@ -907,7 +907,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2022-06-13 16:41:56 PDT

+ 2022-06-17 10:58:03 PDT

 </div>

 </div>

 </body>

diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index bc18df2cc..1f306c070 100644
--- a/howto/separating-topic-branches.html
+++ b/howto/separating-topic-branches.html
@@ -841,7 +841,7 @@ o---o"master"</code></pre>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2022-06-13 16:41:57 PDT

+ 2022-06-17 10:58:04 PDT

 </div>

 </div>

 </body>

diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index b207f51fe..eae88725c 100644
--- a/howto/setup-git-server-over-http.html
+++ b/howto/setup-git-server-over-http.html
@@ -1071,7 +1071,7 @@ help diagnosing the problem, but removes security checks.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2022-06-13 16:41:56 PDT

+ 2022-06-17 10:58:04 PDT

 </div>

 </div>

 </body>

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index 24f2499c8..a60f50895 100644
--- a/howto/update-hook-example.html
+++ b/howto/update-hook-example.html
@@ -930,7 +930,7 @@ that JC can make non-fast-forward pushes on it.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2022-06-13 16:41:56 PDT

+ 2022-06-17 10:58:04 PDT

 </div>

 </div>

 </body>

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index cb7a5ecef..2cd18f2d1 100644
--- a/howto/use-git-daemon.html
+++ b/howto/use-git-daemon.html
@@ -791,7 +791,7 @@ a good practice to put the paths after a "--" separator.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2022-06-13 16:41:56 PDT

+ 2022-06-17 10:58:04 PDT

 </div>

 </div>

 </body>

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index 9620b0774..63a2e5a73 100644
--- a/howto/using-merge-subtree.html
+++ b/howto/using-merge-subtree.html
@@ -848,7 +848,7 @@ Please note that if the other project merges from you, then it will
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2022-06-13 16:41:56 PDT

+ 2022-06-17 10:58:03 PDT

 </div>

 </div>

 </body>

diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html
index ff8a30fc8..4008bb36c 100644
--- a/howto/using-signed-tag-in-pull-request.html
+++ b/howto/using-signed-tag-in-pull-request.html
@@ -952,7 +952,7 @@ as part of the merge commit.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2022-06-13 16:41:56 PDT

+ 2022-06-17 10:58:04 PDT

 </div>

 </div>

 </body>