Skip to content

Commit d07b5d9

Browse files
committed
Merge branch 'tb/pseudo-merge-reachability-bitmap'
Doc update. * tb/pseudo-merge-reachability-bitmap: Documentation/gitpacking: make sample configs listing blocks
2 parents ef2447d + df8b056 commit d07b5d9

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

Documentation/gitpacking.txt

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,14 +143,16 @@ include::config/bitmap-pseudo-merge.txt[]
143143
Suppose that you have a repository with a large number of references,
144144
and you want a bare-bones configuration of pseudo-merge bitmaps that
145145
will enhance bitmap coverage of the `refs/` namespace. You may start
146-
wiht a configuration like so:
146+
with a configuration like so:
147147

148-
[bitmapPseudoMerge "all"]
148+
----
149+
[bitmapPseudoMerge "all"]
149150
pattern = "refs/"
150151
threshold = now
151152
stableThreshold = never
152153
sampleRate = 100
153154
maxMerges = 64
155+
----
154156

155157
This will create pseudo-merge bitmaps for all references, regardless of
156158
their age, and group them into 64 pseudo-merge commits.
@@ -159,21 +161,25 @@ If you wanted to separate tags from branches when generating
159161
pseudo-merge commits, you would instead define the pattern with a
160162
capture group, like so:
161163

162-
[bitmapPseudoMerge "all"]
164+
----
165+
[bitmapPseudoMerge "all"]
163166
pattern = "refs/(heads/tags)/"
167+
----
164168

165169
Suppose instead that you are working in a fork-network repository, with
166170
each fork specified by some numeric ID, and whose refs reside in
167171
`refs/virtual/NNN/` (where `NNN` is the numeric ID corresponding to some
168172
fork) in the network. In this instance, you may instead write something
169173
like:
170174

171-
[bitmapPseudoMerge "all"]
175+
----
176+
[bitmapPseudoMerge "all"]
172177
pattern = "refs/virtual/([0-9]+)/(heads|tags)/"
173178
threshold = now
174179
stableThreshold = never
175180
sampleRate = 100
176181
maxMerges = 64
182+
----
177183

178184
Which would generate pseudo-merge group identifiers like "1234-heads",
179185
and "5678-tags" (for branches in fork "1234", and tags in remote "5678",

0 commit comments

Comments
 (0)