summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-03-06 22:15:21 -0800
committerJunio C Hamano <gitster@pobox.com>2023-03-06 22:15:21 -0800
commitf8c9d08c90610f6063181bdc2c41e83dd8fc2113 (patch)
treea75a7af46af6b3c0e71a66abd2077c104af96733
parent33614a27871f44d78c9212ce8042ed091f0e499c (diff)
downloadgit-htmldocs-f8c9d08c90610f6063181bdc2c41e83dd8fc2113.tar.gz
Autogenerated HTML docs for v2.40.0-rc2
-rw-r--r--SubmittingPatches.html2
-rw-r--r--git-config.html2
-rw-r--r--gitformat-signature.html41
-rw-r--r--gitformat-signature.txt22
-rw-r--r--howto-index.html2
-rw-r--r--howto/coordinate-embargoed-releases.html2
-rw-r--r--howto/keep-canonical-history-correct.html2
-rw-r--r--howto/maintain-git.html2
-rw-r--r--howto/new-command.html2
-rw-r--r--howto/rebase-from-internal-branch.html2
-rw-r--r--howto/rebuild-from-update-hook.html2
-rw-r--r--howto/recover-corrupted-blob-object.html2
-rw-r--r--howto/recover-corrupted-object-harder.html2
-rw-r--r--howto/revert-a-faulty-merge.html2
-rw-r--r--howto/revert-branch-rebase.html2
-rw-r--r--howto/separating-topic-branches.html2
-rw-r--r--howto/setup-git-server-over-http.html2
-rw-r--r--howto/update-hook-example.html2
-rw-r--r--howto/use-git-daemon.html2
-rw-r--r--howto/using-merge-subtree.html2
-rw-r--r--howto/using-signed-tag-in-pull-request.html2
-rw-r--r--technical/api-index.html2
22 files changed, 73 insertions, 30 deletions
diff --git a/SubmittingPatches.html b/SubmittingPatches.html
index 303cfd227..7bc11db7b 100644
--- a/SubmittingPatches.html
+++ b/SubmittingPatches.html
@@ -1446,7 +1446,7 @@ this problem around.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2023-03-01 08:44:21 PST
+ 2023-03-06 22:13:12 PST
</div>
</div>
</body>
diff --git a/git-config.html b/git-config.html
index 80bb58728..864ac0fff 100644
--- a/git-config.html
+++ b/git-config.html
@@ -6477,6 +6477,8 @@ gpg.format
Specifies which key format to use when signing with <code>--gpg-sign</code>.
Default is "openpgp". Other possible values are "x509", "ssh".
</p>
+<div class="paragraph"><p>See <a href="gitformat-signature.html">gitformat-signature(5)</a> for the signature format, which differs
+based on the selected <code>gpg.format</code>.</p></div>
</dd>
<dt class="hdlist1">
gpg.&lt;format&gt;.program
diff --git a/gitformat-signature.html b/gitformat-signature.html
index 3237135b6..da48c3b9e 100644
--- a/gitformat-signature.html
+++ b/gitformat-signature.html
@@ -761,11 +761,40 @@ gitformat-signature(5) Manual Page
<div class="paragraph"><p>Git uses cryptographic signatures in various places, currently objects (tags,
commits, mergetags) and transactions (pushes). In every case, the command which
is about to create an object or transaction determines a payload from that,
-calls gpg to obtain a detached signature for the payload (<code>gpg -bsa</code>) and
-embeds the signature into the object or transaction.</p></div>
-<div class="paragraph"><p>Signatures always begin with <code>-----BEGIN PGP SIGNATURE-----</code>
-and end with <code>-----END PGP SIGNATURE-----</code>, unless gpg is told to
-produce RFC1991 signatures which use <code>MESSAGE</code> instead of <code>SIGNATURE</code>.</p></div>
+calls an external program to obtain a detached signature for the payload
+(<code>gpg -bsa</code> in the case of PGP signatures), and embeds the signature into the
+object or transaction.</p></div>
+<div class="paragraph"><p>Signatures begin with an "ASCII Armor" header line and end with a tail line,
+which differ depending on signature type (as selected by <code>gpg.format</code>, see
+<a href="git-config.html">git-config(1)</a>). These are, for <code>gpg.format</code> values:</p></div>
+<div class="dlist"><dl>
+<dt class="hdlist1">
+<code>gpg</code> (PGP)
+</dt>
+<dd>
+<p>
+ <code>-----BEGIN PGP SIGNATURE-----</code> and <code>-----END PGP SIGNATURE-----</code>.
+ Or, if gpg is told to produce RFC1991 signatures,
+ <code>-----BEGIN PGP MESSAGE-----</code> and <code>-----END PGP MESSAGE-----</code>
+</p>
+</dd>
+<dt class="hdlist1">
+<code>ssh</code> (SSH)
+</dt>
+<dd>
+<p>
+ <code>-----BEGIN SSH SIGNATURE-----</code> and <code>-----END SSH SIGNATURE-----</code>
+</p>
+</dd>
+<dt class="hdlist1">
+<code>x509</code> (X.509)
+</dt>
+<dd>
+<p>
+ <code>-----BEGIN SIGNED MESSAGE-----</code> and <code>-----END SIGNED MESSAGE-----</code>
+</p>
+</dd>
+</dl></div>
<div class="paragraph"><p>Signatures sometimes appear as a part of the normal payload
(e.g. a signed tag has the signature block appended after the payload
that the signature applies to), and sometimes appear in the value of
@@ -1035,7 +1064,7 @@ Date: Wed Jun 15 09:13:29 2016 +0000
<div id="footer">
<div id="footer-text">
Last updated
- 2023-01-30 14:44:53 PST
+ 2023-03-06 22:13:04 PST
</div>
</div>
</body>
diff --git a/gitformat-signature.txt b/gitformat-signature.txt
index d8e3eb1ba..d4d3a31f0 100644
--- a/gitformat-signature.txt
+++ b/gitformat-signature.txt
@@ -17,12 +17,24 @@ DESCRIPTION
Git uses cryptographic signatures in various places, currently objects (tags,
commits, mergetags) and transactions (pushes). In every case, the command which
is about to create an object or transaction determines a payload from that,
-calls gpg to obtain a detached signature for the payload (`gpg -bsa`) and
-embeds the signature into the object or transaction.
+calls an external program to obtain a detached signature for the payload
+(`gpg -bsa` in the case of PGP signatures), and embeds the signature into the
+object or transaction.
-Signatures always begin with `-----BEGIN PGP SIGNATURE-----`
-and end with `-----END PGP SIGNATURE-----`, unless gpg is told to
-produce RFC1991 signatures which use `MESSAGE` instead of `SIGNATURE`.
+Signatures begin with an "ASCII Armor" header line and end with a tail line,
+which differ depending on signature type (as selected by `gpg.format`, see
+linkgit:git-config[1]). These are, for `gpg.format` values:
+
+`gpg` (PGP)::
+ `-----BEGIN PGP SIGNATURE-----` and `-----END PGP SIGNATURE-----`.
+ Or, if gpg is told to produce RFC1991 signatures,
+ `-----BEGIN PGP MESSAGE-----` and `-----END PGP MESSAGE-----`
+
+`ssh` (SSH)::
+ `-----BEGIN SSH SIGNATURE-----` and `-----END SSH SIGNATURE-----`
+
+`x509` (X.509)::
+ `-----BEGIN SIGNED MESSAGE-----` and `-----END SIGNED MESSAGE-----`
Signatures sometimes appear as a part of the normal payload
(e.g. a signed tag has the signature block appended after the payload
diff --git a/howto-index.html b/howto-index.html
index 1d313eff6..f66c0dd63 100644
--- a/howto-index.html
+++ b/howto-index.html
@@ -895,7 +895,7 @@ later validate it.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2023-03-01 08:44:17 PST
+ 2023-03-06 22:13:08 PST
</div>
</div>
</body>
diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html
index f37ba4767..0c42fb4c5 100644
--- a/howto/coordinate-embargoed-releases.html
+++ b/howto/coordinate-embargoed-releases.html
@@ -1038,7 +1038,7 @@ Thanks,
<div id="footer">
<div id="footer-text">
Last updated
- 2023-03-01 13:45:40 PST
+ 2023-03-06 22:13:11 PST
</div>
</div>
</body>
diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index c3a90ae3a..cf35fc8dc 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
- 2023-03-01 13:45:39 PST
+ 2023-03-06 22:13:10 PST
</div>
</div>
</body>
diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index 62eb62c0e..365406634 100644
--- a/howto/maintain-git.html
+++ b/howto/maintain-git.html
@@ -1478,7 +1478,7 @@ $ git update-ref -d $mf/ai/topic</code></pre>
<div id="footer">
<div id="footer-text">
Last updated
- 2023-03-01 13:45:40 PST
+ 2023-03-06 22:13:11 PST
</div>
</div>
</body>
diff --git a/howto/new-command.html b/howto/new-command.html
index ac4befd4c..642d277bd 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
- 2023-03-01 13:45:37 PST
+ 2023-03-06 22:13:09 PST
</div>
</div>
</body>
diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index ef9354f39..77f332422 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
- 2023-03-01 13:45:39 PST
+ 2023-03-06 22:13:10 PST
</div>
</div>
</body>
diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index 358b6c433..95585cd53 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
- 2023-03-01 13:45:39 PST
+ 2023-03-06 22:13:10 PST
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index 4ac68a96c..012b5b326 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
- 2023-03-01 13:45:39 PST
+ 2023-03-06 22:13:10 PST
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index db315095e..6dcb886f2 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
- 2023-03-01 13:45:39 PST
+ 2023-03-06 22:13:10 PST
</div>
</div>
</body>
diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index af2e2e179..c7b1dad35 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
- 2023-03-01 13:45:39 PST
+ 2023-03-06 22:13:10 PST
</div>
</div>
</body>
diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index 4bbb8cbdf..501d6003c 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
- 2023-03-01 13:45:37 PST
+ 2023-03-06 22:13:09 PST
</div>
</div>
</body>
diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index b7716d905..27087dd3e 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
- 2023-03-01 13:45:39 PST
+ 2023-03-06 22:13:10 PST
</div>
</div>
</body>
diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index 81cdb2442..bcd9a8f0e 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
- 2023-03-01 13:45:38 PST
+ 2023-03-06 22:13:10 PST
</div>
</div>
</body>
diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index d0d892872..9fcc4055c 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
- 2023-03-01 13:45:38 PST
+ 2023-03-06 22:13:09 PST
</div>
</div>
</body>
diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index 02bb860ad..86e086100 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
- 2023-03-01 13:45:38 PST
+ 2023-03-06 22:13:09 PST
</div>
</div>
</body>
diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index d8f64b3af..ab32e9e7b 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
- 2023-03-01 13:45:38 PST
+ 2023-03-06 22:13:09 PST
</div>
</div>
</body>
diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html
index 1d5824420..1f39bbca5 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
- 2023-03-01 13:45:38 PST
+ 2023-03-06 22:13:09 PST
</div>
</div>
</body>
diff --git a/technical/api-index.html b/technical/api-index.html
index 1962c7e5c..634a6e929 100644
--- a/technical/api-index.html
+++ b/technical/api-index.html
@@ -775,7 +775,7 @@ documents them.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2023-03-01 08:44:23 PST
+ 2023-03-06 22:13:14 PST
</div>
</div>
</body>