[PATCH] doc: move extensions.worktreeConfig to the right place
- Date: Wed, 14 Nov 2018 17:02:47 +0100
- From: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx>
- Subject: [PATCH] doc: move extensions.worktreeConfig to the right place
All config extensions are described in technical/repository-version.txt.
I made a mistake of adding it in config.txt instead. This patch moves
it back to where it belongs.
Since repository-version.txt is not part of officially generated
documents (it's not even part of DOC_HTML target), it's only visible
to developers who read plain .txt files. Let's include it in
gitrepository-layout.5 for more visibility. Some minor asciidoc fixes
are required in repository-version.txt to make this happen.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx>
Documentation/config.txt | 7 -----
Documentation/gitrepository-layout.txt | 2 ++
.../technical/repository-version.txt | 26 ++++++++++---------
3 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 3e735f1a9a..d87846faa6 100644
@@ -292,13 +292,6 @@ include::config/advice.txt
- If set, by default "git config" reads from both "config" and
- "config.worktree" file from GIT_DIR in that order. In
- multiple working directory mode, "config" file is shared while
- "config.worktree" is per-working directory (i.e., it's in
diff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt
index d501af9d77..366dee238c 100644
@@ -290,6 +290,8 @@ worktrees/<id>/locked::
Working directory specific configuration file.
diff --git a/Documentation/technical/repository-version.txt b/Documentation/technical/repository-version.txt
index e03eaccebc..7844ef30ff 100644
@@ -1,5 +1,4 @@
-Git Repository Format Versions
+== Git Repository Format Versions
Every git repository is marked with a numeric version in the
`core.repositoryformatversion` key of its `config` file. This version
@@ -40,16 +39,14 @@ format by default.
The currently defined format versions are:
+=== Version `0`
This is the format defined by the initial version of git, including but
not limited to the format of the repository directory, the repository
configuration file, and the object and ref storage. Specifying the
complete behavior of git is beyond the scope of this document.
+=== Version `1`
This format is identical to version `0`, with the following exceptions:
@@ -74,21 +71,18 @@ it here, in order to claim the name.
The defined extensions are:
This extension does not change git's behavior at all. It is useful only
for testing format-1 compatibility.
When the config key `extensions.preciousObjects` is set to `true`,
objects in the repository MUST NOT be deleted (e.g., by `git-prune` or
`git repack -d`).
When the config key `extensions.partialclone` is set, it indicates
that the repo was created with a partial clone (or later performed
@@ -98,3 +92,11 @@ and it promises that all such omitted objects can be fetched from it
in the future.
The value of this key is the name of the promisor remote.
+If set, by default "git config" reads from both "config" and
+"config.worktree" file from GIT_DIR in that order. In
+multiple working directory mode, "config" file is shared while
+"config.worktree" is per-working directory (i.e., it's in