diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-07-27 09:48:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-07-27 09:48:21 -0700 |
| commit | a85030a62a0cfffe9f4c52b89e611a498eaba04b (patch) | |
| tree | 2f760cef70650f12664cf0a41239e07b99e28986 /technical | |
| parent | 6bba246d46431b32c3be3676fb727605cf6d2847 (diff) | |
| download | git-htmldocs-a85030a62a0cfffe9f4c52b89e611a498eaba04b.tar.gz | |
Autogenerated HTML docs for v2.37.1-261-g15b17e
Diffstat (limited to 'technical')
30 files changed, 156 insertions, 35 deletions
diff --git a/technical/api-error-handling.html b/technical/api-error-handling.html index fb98bca76..c9659fcb7 100644 --- a/technical/api-error-handling.html +++ b/technical/api-error-handling.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 10.1.4" />
+<meta name="generator" content="AsciiDoc 10.2.0" />
<title>Error reporting in git</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
diff --git a/technical/api-index.html b/technical/api-index.html index 1869d3c21..315402a59 100644 --- a/technical/api-index.html +++ b/technical/api-index.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 10.1.4" />
+<meta name="generator" content="AsciiDoc 10.2.0" />
<title>Git API Documents</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
diff --git a/technical/api-merge.html b/technical/api-merge.html index 1c77f5804..3f7f49e5a 100644 --- a/technical/api-merge.html +++ b/technical/api-merge.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 10.1.4" />
+<meta name="generator" content="AsciiDoc 10.2.0" />
<title>merge API</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
diff --git a/technical/api-parse-options.html b/technical/api-parse-options.html index 5cbafe4f9..3298585db 100644 --- a/technical/api-parse-options.html +++ b/technical/api-parse-options.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 10.1.4" />
+<meta name="generator" content="AsciiDoc 10.2.0" />
<title>parse-options API</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
diff --git a/technical/api-simple-ipc.html b/technical/api-simple-ipc.html index f72c82f98..7094be5ca 100644 --- a/technical/api-simple-ipc.html +++ b/technical/api-simple-ipc.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 10.1.4" />
+<meta name="generator" content="AsciiDoc 10.2.0" />
<title>Simple-IPC API</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
diff --git a/technical/api-trace2.html b/technical/api-trace2.html index 1098a47c6..c28fe02c3 100644 --- a/technical/api-trace2.html +++ b/technical/api-trace2.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 10.1.4" />
+<meta name="generator" content="AsciiDoc 10.2.0" />
<title>Trace2 API</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
diff --git a/technical/bitmap-format.html b/technical/bitmap-format.html index 7af67d8f5..064d14f25 100644 --- a/technical/bitmap-format.html +++ b/technical/bitmap-format.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 10.1.4" />
+<meta name="generator" content="AsciiDoc 10.2.0" />
<title>GIT bitmap v1 format</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
diff --git a/technical/bundle-format.html b/technical/bundle-format.html index 6558ab699..e18a0ebe0 100644 --- a/technical/bundle-format.html +++ b/technical/bundle-format.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 10.1.4" />
+<meta name="generator" content="AsciiDoc 10.2.0" />
<title>Git bundle v2 format</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
diff --git a/technical/cruft-packs.html b/technical/cruft-packs.html index 4b99f6986..cc86091e8 100644 --- a/technical/cruft-packs.html +++ b/technical/cruft-packs.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 10.1.4" />
+<meta name="generator" content="AsciiDoc 10.2.0" />
<title>Cruft packs</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
diff --git a/technical/hash-function-transition.html b/technical/hash-function-transition.html index 943195faf..62f1b52ea 100644 --- a/technical/hash-function-transition.html +++ b/technical/hash-function-transition.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 10.1.4" />
+<meta name="generator" content="AsciiDoc 10.2.0" />
<title>Git hash function transition</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
diff --git a/technical/http-protocol.html b/technical/http-protocol.html index fafca3737..fa23376e8 100644 --- a/technical/http-protocol.html +++ b/technical/http-protocol.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 10.1.4" />
+<meta name="generator" content="AsciiDoc 10.2.0" />
<title>HTTP transfer protocols</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
diff --git a/technical/index-format.html b/technical/index-format.html index dc1a06a37..27c17176d 100644 --- a/technical/index-format.html +++ b/technical/index-format.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 10.1.4" />
+<meta name="generator" content="AsciiDoc 10.2.0" />
<title>Git index format</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -784,10 +784,6 @@ be ignored if Git does not understand them.</code></pre> </div></div>
<div class="literalblock">
<div class="content">
-<pre><code>Git currently supports cache tree and resolve undo extensions.</code></pre>
-</div></div>
-<div class="literalblock">
-<div class="content">
<pre><code>4-byte extension signature. If the first byte is 'A'..'Z' the
extension is optional and can be ignored.</code></pre>
</div></div>
@@ -1464,7 +1460,7 @@ this extension.</code></pre> <div id="footer">
<div id="footer-text">
Last updated
- 2021-04-29 23:16:11 PDT
+ 2022-07-27 09:46:08 PDT
</div>
</div>
</body>
diff --git a/technical/index-format.txt b/technical/index-format.txt index 65da0daaa..f691c20ab 100644 --- a/technical/index-format.txt +++ b/technical/index-format.txt @@ -26,8 +26,6 @@ Git index format Extensions are identified by signature. Optional extensions can be ignored if Git does not understand them. - Git currently supports cache tree and resolve undo extensions. - 4-byte extension signature. If the first byte is 'A'..'Z' the extension is optional and can be ignored. diff --git a/technical/long-running-process-protocol.html b/technical/long-running-process-protocol.html index 1942c125e..410ec6d23 100644 --- a/technical/long-running-process-protocol.html +++ b/technical/long-running-process-protocol.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 10.1.4" />
+<meta name="generator" content="AsciiDoc 10.2.0" />
<title>Long-running process protocol</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
diff --git a/technical/multi-pack-index.html b/technical/multi-pack-index.html index 9d7acab16..2188c629b 100644 --- a/technical/multi-pack-index.html +++ b/technical/multi-pack-index.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 10.1.4" />
+<meta name="generator" content="AsciiDoc 10.2.0" />
<title>Multi-Pack-Index (MIDX) Design Notes</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
diff --git a/technical/pack-format.html b/technical/pack-format.html index 2149c9ddb..eb8c0f37c 100644 --- a/technical/pack-format.html +++ b/technical/pack-format.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 10.1.4" />
+<meta name="generator" content="AsciiDoc 10.2.0" />
<title>Git pack format</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
diff --git a/technical/pack-heuristics.html b/technical/pack-heuristics.html index dd2208262..65a36f3a9 100644 --- a/technical/pack-heuristics.html +++ b/technical/pack-heuristics.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 10.1.4" />
+<meta name="generator" content="AsciiDoc 10.2.0" />
<title>Concerning Git’s Packing Heuristics</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
diff --git a/technical/pack-protocol.html b/technical/pack-protocol.html index c750a3987..56423a73a 100644 --- a/technical/pack-protocol.html +++ b/technical/pack-protocol.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 10.1.4" />
+<meta name="generator" content="AsciiDoc 10.2.0" />
<title>Packfile transfer protocols</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
diff --git a/technical/parallel-checkout.html b/technical/parallel-checkout.html index 3fc39be22..74bca8547 100644 --- a/technical/parallel-checkout.html +++ b/technical/parallel-checkout.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 10.1.4" />
+<meta name="generator" content="AsciiDoc 10.2.0" />
<title>Parallel Checkout Design Notes</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
diff --git a/technical/partial-clone.html b/technical/partial-clone.html index 9adecceb5..ba91f11e8 100644 --- a/technical/partial-clone.html +++ b/technical/partial-clone.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 10.1.4" />
+<meta name="generator" content="AsciiDoc 10.2.0" />
<title>Partial Clone Design Notes</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
diff --git a/technical/protocol-capabilities.html b/technical/protocol-capabilities.html index 3a1f7cf13..6acd2e851 100644 --- a/technical/protocol-capabilities.html +++ b/technical/protocol-capabilities.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 10.1.4" />
+<meta name="generator" content="AsciiDoc 10.2.0" />
<title>Git Protocol Capabilities</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
diff --git a/technical/protocol-common.html b/technical/protocol-common.html index 8c192da56..60571b637 100644 --- a/technical/protocol-common.html +++ b/technical/protocol-common.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 10.1.4" />
+<meta name="generator" content="AsciiDoc 10.2.0" />
<title>Documentation Common to Pack and Http Protocols</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
diff --git a/technical/protocol-v2.html b/technical/protocol-v2.html index b73a2bbd3..7f915e7d5 100644 --- a/technical/protocol-v2.html +++ b/technical/protocol-v2.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 10.1.4" />
+<meta name="generator" content="AsciiDoc 10.2.0" />
<title>Git Wire Protocol, Version 2</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
diff --git a/technical/racy-git.html b/technical/racy-git.html index cca9b317f..cdc25021d 100644 --- a/technical/racy-git.html +++ b/technical/racy-git.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 10.1.4" />
+<meta name="generator" content="AsciiDoc 10.2.0" />
<title>Use of index and Racy Git problem</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
diff --git a/technical/reftable.html b/technical/reftable.html index a00233aae..16c612f24 100644 --- a/technical/reftable.html +++ b/technical/reftable.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 10.1.4" />
+<meta name="generator" content="AsciiDoc 10.2.0" />
<title></title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
diff --git a/technical/scalar.txt b/technical/scalar.txt new file mode 100644 index 000000000..08bc09c22 --- /dev/null +++ b/technical/scalar.txt @@ -0,0 +1,127 @@ +Scalar +====== + +Scalar is a repository management tool that optimizes Git for use in large +repositories. It accomplishes this by helping users to take advantage of +advanced performance features in Git. Unlike most other Git built-in commands, +Scalar is not executed as a subcommand of 'git'; rather, it is built as a +separate executable containing its own series of subcommands. + +Background +---------- + +Scalar was originally designed as an add-on to Git and implemented as a .NET +Core application. It was created based on the learnings from the VFS for Git +project (another application aimed at improving the experience of working with +large repositories). As part of its initial implementation, Scalar relied on +custom features in the Microsoft fork of Git that have since been integrated +into core Git: + +* partial clone, +* commit graphs, +* multi-pack index, +* sparse checkout (cone mode), +* scheduled background maintenance, +* etc + +With the requisite Git functionality in place and a desire to bring the benefits +of Scalar to the larger Git community, the Scalar application itself was ported +from C# to C and integrated upstream. + +Features +-------- + +Scalar is comprised of two major pieces of functionality: automatically +configuring built-in Git performance features and managing repository +enlistments. + +The Git performance features configured by Scalar (see "Background" for +examples) confer substantial performance benefits to large repositories, but are +either too experimental to enable for all of Git yet, or only benefit large +repositories. As new features are introduced, Scalar should be updated +accordingly to incorporate them. This will prevent the tool from becoming stale +while also providing a path for more easily bringing features to the appropriate +users. + +Enlistments are how Scalar knows which repositories on a user's system should +utilize Scalar-configured features. This allows it to update performance +settings when new ones are added to the tool, as well as centrally manage +repository maintenance. The enlistment structure - a root directory with a +`src/` subdirectory containing the cloned repository itself - is designed to +encourage users to route build outputs outside of the repository to avoid the +performance-limiting overhead of ignoring those files in Git. + +Design +------ + +Scalar is implemented in C and interacts with Git via a mix of child process +invocations of Git and direct usage of `libgit.a`. Internally, it is structured +much like other built-ins with subcommands (e.g., `git stash`), containing a +`cmd_<subcommand>()` function for each subcommand, routed through a `cmd_main()` +function. Most options are unique to each subcommand, with `scalar` respecting +some "global" `git` options (e.g., `-c` and `-C`). + +Because `scalar` is not invoked as a Git subcommand (like `git scalar`), it is +built and installed as its own executable in the `bin/` directory, alongside +`git`, `git-gui`, etc. + +Roadmap +------- + +NOTE: this section will be removed once the remaining tasks outlined in this +roadmap are complete. + +Scalar is a large enough project that it is being upstreamed incrementally, +living in `contrib/` until it is feature-complete. So far, the following patch +series have been accepted: + +- `scalar-the-beginning`: The initial patch series which sets up + `contrib/scalar/` and populates it with a minimal `scalar` command that + demonstrates the fundamental ideas. + +- `scalar-c-and-C`: The `scalar` command learns about two options that can be + specified before the command, `-c <key>=<value>` and `-C <directory>`. + +- `scalar-diagnose`: The `scalar` command is taught the `diagnose` subcommand. + +Roughly speaking (and subject to change), the following series are needed to +"finish" this initial version of Scalar: + +- Finish Scalar features: Enable the built-in FSMonitor in Scalar enlistments + and implement `scalar help`. At the end of this series, Scalar should be + feature-complete from the perspective of a user. + +- Generalize features not specific to Scalar: In the spirit of making Scalar + configure only what is needed for large repo performance, move common + utilities into other parts of Git. Some of this will be internal-only, but one + major change will be generalizing `scalar diagnose` for use with any Git + repository. + +- Move Scalar to toplevel: Move Scalar out of `contrib/` and into the root of + `git`, including updates to build and install it with the rest of Git. This + change will incorporate Scalar into the Git CI and test framework, as well as + expand regression and performance testing to ensure the tool is stable. + +Finally, there are two additional patch series that exist in Microsoft's fork of +Git, but there is no current plan to upstream them. There are some interesting +ideas there, but the implementation is too specific to Azure Repos and/or VFS +for Git to be of much help in general. + +These still exist mainly because the GVFS protocol is what Azure Repos has +instead of partial clone, while Git is focused on improving partial clone: + +- `scalar-with-gvfs`: The primary purpose of this patch series is to support + existing Scalar users whose repositories are hosted in Azure Repos (which does + not support Git's partial clones, but supports its predecessor, the GVFS + protocol, which is used by Scalar to emulate the partial clone). + + Since the GVFS protocol will never be supported by core Git, this patch series + will remain in Microsoft's fork of Git. + +- `run-scalar-functional-tests`: The Scalar project developed a quite + comprehensive set of integration tests (or, "Functional Tests"). They are the + sole remaining part of the original C#-based Scalar project, and this patch + adds a GitHub workflow that runs them all. + + Since the tests partially depend on features that are only provided in the + `scalar-with-gvfs` patch series, this patch cannot be upstreamed. diff --git a/technical/send-pack-pipeline.html b/technical/send-pack-pipeline.html index a44508479..18d17d7db 100644 --- a/technical/send-pack-pipeline.html +++ b/technical/send-pack-pipeline.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 10.1.4" />
+<meta name="generator" content="AsciiDoc 10.2.0" />
<title>Git-send-pack internals</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
diff --git a/technical/shallow.html b/technical/shallow.html index 88d2d5ef8..d3be7235e 100644 --- a/technical/shallow.html +++ b/technical/shallow.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 10.1.4" />
+<meta name="generator" content="AsciiDoc 10.2.0" />
<title>Shallow commits</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
diff --git a/technical/signature-format.html b/technical/signature-format.html index f0148cad4..dc3376aae 100644 --- a/technical/signature-format.html +++ b/technical/signature-format.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 10.1.4" />
+<meta name="generator" content="AsciiDoc 10.2.0" />
<title>Git signature format</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
diff --git a/technical/trivial-merge.html b/technical/trivial-merge.html index 3f108107c..5d7c6341b 100644 --- a/technical/trivial-merge.html +++ b/technical/trivial-merge.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 10.1.4" />
+<meta name="generator" content="AsciiDoc 10.2.0" />
<title>Trivial merge rules</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
|