aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/config
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-04-09 14:31:44 -0700
committerJunio C Hamano <gitster@pobox.com>2024-04-09 14:31:44 -0700
commit58dd7e4b116b1705cd809604a305de173ecc39e4 (patch)
treeabc42ab932e357d3e59ccde5ac7a8c8d9dc2215e /Documentation/config
parent4697c8a445eee8a6ce82efab7c6306f4916233f7 (diff)
parentebb55042a4416a07c27ba45eeb24e6ff1899f360 (diff)
downloadgit-58dd7e4b116b1705cd809604a305de173ecc39e4.tar.gz
Merge branch 'ja/doc-markup-updates'
Documentation rules has been explicitly described how to mark-up literal parts and a few manual pages have been updated as examples. * ja/doc-markup-updates: doc: git-clone: do not autoreference the manpage in itself doc: git-clone: apply new documentation formatting guidelines doc: git-init: apply new documentation formatting guidelines doc: allow literal and emphasis format in doc vs help tests doc: rework CodingGuidelines with new formatting rules
Diffstat (limited to 'Documentation/config')
-rw-r--r--Documentation/config/clone.txt20
-rw-r--r--Documentation/config/init.txt4
2 files changed, 17 insertions, 7 deletions
diff --git a/Documentation/config/clone.txt b/Documentation/config/clone.txt
index d037b57f72..0a10efd174 100644
--- a/Documentation/config/clone.txt
+++ b/Documentation/config/clone.txt
@@ -1,13 +1,23 @@
-clone.defaultRemoteName::
+`clone.defaultRemoteName`::
The name of the remote to create when cloning a repository. Defaults to
- `origin`, and can be overridden by passing the `--origin` command-line
+ `origin`.
+ifdef::git-clone[]
+ It can be overridden by passing the `--origin` command-line
+ option.
+endif::[]
+ifndef::git-clone[]
+ It can be overridden by passing the `--origin` command-line
option to linkgit:git-clone[1].
+endif::[]
-clone.rejectShallow::
+`clone.rejectShallow`::
Reject cloning a repository if it is a shallow one; this can be overridden by
- passing the `--reject-shallow` option on the command line. See linkgit:git-clone[1]
+ passing the `--reject-shallow` option on the command line.
+ifndef::git-clone[]
+ See linkgit:git-clone[1].
+endif::[]
-clone.filterSubmodules::
+`clone.filterSubmodules`::
If a partial clone filter is provided (see `--filter` in
linkgit:git-rev-list[1]) and `--recurse-submodules` is used, also apply
the filter to submodules.
diff --git a/Documentation/config/init.txt b/Documentation/config/init.txt
index dd1d833273..af03acdbcb 100644
--- a/Documentation/config/init.txt
+++ b/Documentation/config/init.txt
@@ -3,8 +3,8 @@ ifndef::git-init[]
:see-git-init: (See the "TEMPLATE DIRECTORY" section of linkgit:git-init[1].)
endif::[]
-init.templateDir::
+`init.templateDir`::
Specify the directory from which templates will be copied. {see-git-init}
-init.defaultBranch::
+`init.defaultBranch`::
Allows overriding the default branch name e.g. when initializing
a new repository.