git-bundle.txt: Cleanup
Cleanup various spellings of the same argument, as well as the code for the tilde: Since neither '~' nor '\~' work consistently, use '{tilde}'. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Acked-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber committed
Aug 23, 2010 at 11:02 UTC
5e1f9605c48617d2ab4d99272f3363301b48e781
1 file changed
+9
-9
Documentation/git-bundle.txt
+9
-9
@@ -9,7 +9,7 @@ git-bundle - Move objects and refs by archive
9
SYNOPSIS
10
--------
11
[verse]
12
-'git bundle' create <file> <git-rev-list args>
12
+'git bundle' create <file> <git-rev-list-args>
13
'git bundle' verify <file>
14
'git bundle' list-heads <file> [refname...]
15
'git bundle' unbundle <file> [refname...]
@@ -35,7 +35,7 @@ OPTIONS
35
36
create <file>::
37
Used to create a bundle named 'file'. This requires the
38
- 'git rev-list' arguments to define the bundle contents.
38
+ 'git-rev-list-args' arguments to define the bundle contents.
39
40
verify <file>::
41
Used to check that a bundle file is valid and will apply
@@ -57,10 +57,10 @@ unbundle <file>::
57
references matching those in the list are printed. This command is
58
really plumbing, intended to be called only by 'git fetch'.
59
60
-[git-rev-list-args...]::
60
+<git-rev-list-args>::
61
A list of arguments, acceptable to 'git rev-parse' and
62
'git rev-list', that specifies the specific objects and references
63
- to transport. For example, `master\~10..master` causes the
63
+ to transport. For example, `master{tilde}10..master` causes the
64
current master reference to be packaged along with all objects
65
added since its 10th ancestor commit. There is no explicit
66
limit to the number of references and objects that may be
@@ -79,12 +79,12 @@ SPECIFYING REFERENCES
79
80
'git bundle' will only package references that are shown by
81
'git show-ref': this includes heads, tags, and remote heads. References
82
-such as `master\~1` cannot be packaged, but are perfectly suitable for
82
+such as `master{tilde}1` cannot be packaged, but are perfectly suitable for
83
defining the basis. More than one reference may be packaged, and more
84
than one basis can be specified. The objects packaged are those not
85
contained in the union of the given bases. Each basis can be
86
-specified explicitly (e.g. `^master\~10`), or implicitly (e.g.
87
-`master\~10..master`, `--since=10.days.ago master`).
86
+specified explicitly (e.g. `^master{tilde}10`), or implicitly (e.g.
87
+`master{tilde}10..master`, `--since=10.days.ago master`).
88
89
It is very important that the basis used be held by the destination.
90
It is okay to err on the side of caution, causing the bundle file
@@ -154,7 +154,7 @@ machineB$ git pull
154
If you know up to what commit the intended recipient repository should
155
have the necessary objects, you can use that knowledge to specify the
156
basis, giving a cut-off point to limit the revisions and objects that go
157
-in the resulting bundle. The previous example used lastR2bundle tag
157
+in the resulting bundle. The previous example used the lastR2bundle tag
158
for this purpose, but you can use any other options that you would give to
159
the linkgit:git-log[1] command. Here are more examples:
160
@@ -194,7 +194,7 @@ references when fetching:
194
$ git fetch mybundle master:localRef
195
----------------
196
197
-You can also see what references it offers.
197
+You can also see what references it offers:
198
199
----------------
200
$ git ls-remote mybundle