bundle doc: replace "basis" with "prerequsite(s)"
In the preceding commits we introduced new documentation that talks about "[commit|object] prerequsite(s)", but also faithfully moved around existing documentation that talks about the "basis". Let's change both that moved-around documentation and other existing documentation in the file to consistently use "[commit|object]" prerequisite(s)" instead of talking about "basis". The mention of "basis" isn't wrong, but readers will be helped by us using only one term throughout the document for this concept. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Jul 31, 2021 at 10:23 UTC
1d9c8daef8d0c9c9f57e06eac7511c3b9355960b
1 file changed
+7
-7
Documentation/git-bundle.txt
+7
-7
@@ -147,13 +147,13 @@ SPECIFYING REFERENCES
147
Revisions must accompanied by reference names to be packaged in a
148
bundle.
149
150
-More than one reference may be packaged, and more than one basis can
150
+More than one reference may be packaged, and more than one set of prerequisite objects can
151
be specified. The objects packaged are those not contained in the
152
-union of the given bases.
152
+union of the prerequisites.
153
154
The 'git bundle create' command resolves the reference names for you
155
using the same rules as `git rev-parse --abbrev-ref=loose`. Each
156
-basis can be specified explicitly (e.g. `^master~10`), or implicitly
156
+prerequisite can be specified explicitly (e.g. `^master~10`), or implicitly
157
(e.g. `master~10..master`, `--since=10.days.ago master`).
158
159
All of these simple cases are OK (assuming we have a "master" and
@@ -236,7 +236,7 @@ but we can move data from A to B via some mechanism (CD, email, etc.).
236
We want to update R2 with development made on the branch master in R1.
237
238
To bootstrap the process, you can first create a bundle that does not have
239
-any basis. You can use a tag to remember up to what commit you last
239
+any prerequisites. You can use a tag to remember up to what commit you last
240
processed, in order to make it easy to later update the other repository
241
with an incremental bundle:
242
@@ -287,7 +287,7 @@ machineB$ git pull
287
288
If you know up to what commit the intended recipient repository should
289
have the necessary objects, you can use that knowledge to specify the
290
-basis, giving a cut-off point to limit the revisions and objects that go
290
+prerequisites, giving a cut-off point to limit the revisions and objects that go
291
in the resulting bundle. The previous example used the lastR2bundle tag
292
for this purpose, but you can use any other options that you would give to
293
the linkgit:git-log[1] command. Here are more examples:
@@ -298,7 +298,7 @@ You can use a tag that is present in both:
298
$ git bundle create mybundle v1.0.0..master
299
----------------
300
301
-You can use a basis based on time:
301
+You can use a prerequisite based on time:
302
303
----------------
304
$ git bundle create mybundle --since=10.days master
@@ -311,7 +311,7 @@ $ git bundle create mybundle -10 master
311
----------------
312
313
You can run `git-bundle verify` to see if you can extract from a bundle
314
-that was created with a basis:
314
+that was created with a prerequisite:
315
316
----------------
317
$ git bundle verify mybundle