freshlybakedca.ke
Git fork
Merge branch 'ja/doc-markup-attached-paragraph-fix'
Documentation mark-up fix.
* ja/doc-markup-attached-paragraph-fix:
doc: fix indentation of refStorage item in git-config(1)
doc: change the markup of paragraphs following a nested list item
+13
-13
Documentation/config/extensions.adoc
+13
-13
Documentation/config/extensions.adoc
···
3
3
`core.repositoryFormatVersion` is not `1`. See
4
4
linkgit:gitrepository-layout[5].
5
5
+
6
-
--
7
-
compatObjectFormat::
6
+
compatObjectFormat:::
8
7
Specify a compatibility hash algorithm to use. The acceptable values
9
8
are `sha1` and `sha256`. The value specified must be different from the
10
9
value of `extensions.objectFormat`. This allows client level
···
19
18
to change. It currently exists only to allow development and testing of
20
19
the underlying feature and is not designed to be enabled by end users.
21
20
22
-
noop::
21
+
noop:::
23
22
This extension does not change git's behavior at all. It is useful only
24
23
for testing format-1 compatibility.
25
24
+
26
25
For historical reasons, this extension is respected regardless of the
27
26
`core.repositoryFormatVersion` setting.
28
27
29
-
noop-v1::
28
+
noop-v1:::
30
29
This extension does not change git's behavior at all. It is useful only
31
30
for testing format-1 compatibility.
32
31
33
-
objectFormat::
32
+
objectFormat:::
34
33
Specify the hash algorithm to use. The acceptable values are `sha1` and
35
34
`sha256`. If not specified, `sha1` is assumed.
36
35
+
···
38
37
linkgit:git-clone[1]. Trying to change it after initialization will not
39
38
work and will produce hard-to-diagnose issues.
40
39
41
-
partialClone::
40
+
partialClone:::
42
41
When enabled, indicates that the repo was created with a partial clone
43
42
(or later performed a partial fetch) and that the remote may have
44
43
omitted sending certain unwanted objects. Such a remote is called a
···
50
49
For historical reasons, this extension is respected regardless of the
51
50
`core.repositoryFormatVersion` setting.
52
51
53
-
preciousObjects::
52
+
preciousObjects:::
54
53
If enabled, indicates that objects in the repository MUST NOT be deleted
55
54
(e.g., by `git-prune` or `git repack -d`).
56
55
+
57
56
For historical reasons, this extension is respected regardless of the
58
57
`core.repositoryFormatVersion` setting.
59
58
60
-
refStorage::
59
+
refStorage:::
61
60
Specify the ref storage format to use. The acceptable values are:
62
61
+
62
+
--
63
63
include::../ref-storage-format.adoc[]
64
-
64
+
--
65
65
+
66
66
Note that this setting should only be set by linkgit:git-init[1] or
67
67
linkgit:git-clone[1]. Trying to change it after initialization will not
68
68
work and will produce hard-to-diagnose issues.
69
69
70
-
relativeWorktrees::
70
+
relativeWorktrees:::
71
71
If enabled, indicates at least one worktree has been linked with
72
72
relative paths. Automatically set if a worktree has been created or
73
73
repaired with either the `--relative-paths` option or with the
74
74
`worktree.useRelativePaths` config set to `true`.
75
75
76
-
worktreeConfig::
76
+
worktreeConfig:::
77
77
If enabled, then worktrees will load config settings from the
78
78
`$GIT_DIR/config.worktree` file in addition to the
79
79
`$GIT_COMMON_DIR/config` file. Note that `$GIT_COMMON_DIR` and
···
87
87
certain values from the common config file to the main working tree's
88
88
`config.worktree` file, if present:
89
89
+
90
+
--
90
91
* `core.worktree` must be moved from `$GIT_COMMON_DIR/config` to
91
92
`$GIT_COMMON_DIR/config.worktree`.
92
93
* If `core.bare` is true, then it must be moved from `$GIT_COMMON_DIR/config`
93
94
to `$GIT_COMMON_DIR/config.worktree`.
94
-
95
+
--
95
96
+
96
97
It may also be beneficial to adjust the locations of `core.sparseCheckout`
97
98
and `core.sparseCheckoutCone` depending on your desire for customizable
···
104
105
+
105
106
For historical reasons, this extension is respected regardless of the
106
107
`core.repositoryFormatVersion` setting.
107
-
--
+4
-2
Documentation/pretty-formats.adoc
+4
-2
Documentation/pretty-formats.adoc
···
232
232
colon and zero or more comma-separated options. Option values may contain
233
233
literal formatting codes. These must be used for commas (`%x2C`) and closing
234
234
parentheses (`%x29`), due to their role in the option syntax.
235
-
+
235
+
236
236
** `prefix=<value>`: Shown before the list of ref names. Defaults to "{nbsp}++(++".
237
237
** `suffix=<value>`: Shown after the list of ref names. Defaults to "+)+".
238
238
** `separator=<value>`: Shown between ref names. Defaults to "+,+{nbsp}".
···
241
241
** `tag=<value>`: Shown before tag names. Defaults to "`tag:`{nbsp}".
242
242
243
243
+
244
+
--
244
245
For example, to produce decorations with no wrapping
245
246
or tag annotations, and spaces as separators:
246
-
+
247
+
247
248
++%(decorate:prefix=,suffix=,tag=,separator= )++
249
+
--
248
250
249
251
++%(describe++`[:<option>,...]`++)++::
250
252
human-readable name, like linkgit:git-describe[1]; empty string for