summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2026-04-13 13:54:57 -0700
committerJunio C Hamano <gitster@pobox.com>2026-04-13 13:54:57 -0700
commitec091e07d1bf34b72188ff30be91ff4e9e0417f4 (patch)
treeb90e26b1396ff0be7e0b3b1b60ff10b5463cc86b
parentb2b627bd52a7186d615f4b42f900206e6822ee7d (diff)
parenta65cbd87eaebe1bb7f69b41332dd85b72cdea440 (diff)
downloadgit-ec091e07d1bf34b72188ff30be91ff4e9e0417f4.tar.gz
git-ec091e07d1bf34b72188ff30be91ff4e9e0417f4.zip
Merge branch 'jk/doc-markup-sub-list-indentation'
Doc mark-up update for entries in the glossary with bulleted lists. * jk/doc-markup-sub-list-indentation: gitglossary: fix indentation of sub-lists
-rw-r--r--Documentation/glossary-content.adoc6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/glossary-content.adoc b/Documentation/glossary-content.adoc
index 20ba121314..8c4e9dd3be 100644
--- a/Documentation/glossary-content.adoc
+++ b/Documentation/glossary-content.adoc
@@ -430,6 +430,7 @@ full pathname may have special meaning:
matches "`a/b`", "`a/x/b`", "`a/x/y/b`" and so on.
- Other consecutive asterisks are considered invalid.
+
+
Glob magic is incompatible with literal magic.
@@ -452,6 +453,7 @@ these forms:
- "`!ATTR`" requires that the attribute `ATTR` be
unspecified.
+
+
Note that when matching against a tree object, attributes are still
obtained from working tree, not from the given tree object.
@@ -560,14 +562,17 @@ The ref namespace is hierarchical.
Ref names must either start with `refs/` or be located in the root of
the hierarchy. For the latter, their name must follow these rules:
+
+--
- The name consists of only upper-case characters or underscores.
- The name ends with "`_HEAD`" or is equal to "`HEAD`".
+--
+
There are some irregular refs in the root of the hierarchy that do not
match these rules. The following list is exhaustive and shall not be
extended in the future:
+
+--
- `AUTO_MERGE`
- `BISECT_EXPECTED_REV`
@@ -577,6 +582,7 @@ extended in the future:
- `NOTES_MERGE_REF`
- `MERGE_AUTOSTASH`
+--
+
Different subhierarchies are used for different purposes. For example,
the `refs/heads/` hierarchy is used to represent local branches whereas