Skip to content

Commit ec091e0

Browse files
committed
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
2 parents b2b627b + a65cbd8 commit ec091e0

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

Documentation/glossary-content.adoc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,7 @@ full pathname may have special meaning:
430430
matches "`a/b`", "`a/x/b`", "`a/x/y/b`" and so on.
431431

432432
- Other consecutive asterisks are considered invalid.
433+
433434
+
434435
Glob magic is incompatible with literal magic.
435436

@@ -452,6 +453,7 @@ these forms:
452453

453454
- "`!ATTR`" requires that the attribute `ATTR` be
454455
unspecified.
456+
455457
+
456458
Note that when matching against a tree object, attributes are still
457459
obtained from working tree, not from the given tree object.
@@ -560,14 +562,17 @@ The ref namespace is hierarchical.
560562
Ref names must either start with `refs/` or be located in the root of
561563
the hierarchy. For the latter, their name must follow these rules:
562564
+
565+
--
563566
- The name consists of only upper-case characters or underscores.
564567

565568
- The name ends with "`_HEAD`" or is equal to "`HEAD`".
569+
--
566570
+
567571
There are some irregular refs in the root of the hierarchy that do not
568572
match these rules. The following list is exhaustive and shall not be
569573
extended in the future:
570574
+
575+
--
571576
- `AUTO_MERGE`
572577

573578
- `BISECT_EXPECTED_REV`
@@ -577,6 +582,7 @@ extended in the future:
577582
- `NOTES_MERGE_REF`
578583

579584
- `MERGE_AUTOSTASH`
585+
--
580586
+
581587
Different subhierarchies are used for different purposes. For example,
582588
the `refs/heads/` hierarchy is used to represent local branches whereas

0 commit comments

Comments
 (0)