Skip to content

Commit 5e1f960

Browse files
Michael J Grubergitster
authored andcommitted
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>
1 parent bc38219 commit 5e1f960

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

Documentation/git-bundle.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ git-bundle - Move objects and refs by archive
99
SYNOPSIS
1010
--------
1111
[verse]
12-
'git bundle' create <file> <git-rev-list args>
12+
'git bundle' create <file> <git-rev-list-args>
1313
'git bundle' verify <file>
1414
'git bundle' list-heads <file> [refname...]
1515
'git bundle' unbundle <file> [refname...]
@@ -35,7 +35,7 @@ OPTIONS
3535

3636
create <file>::
3737
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.
3939

4040
verify <file>::
4141
Used to check that a bundle file is valid and will apply
@@ -57,10 +57,10 @@ unbundle <file>::
5757
references matching those in the list are printed. This command is
5858
really plumbing, intended to be called only by 'git fetch'.
5959

60-
[git-rev-list-args...]::
60+
<git-rev-list-args>::
6161
A list of arguments, acceptable to 'git rev-parse' and
6262
'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
6464
current master reference to be packaged along with all objects
6565
added since its 10th ancestor commit. There is no explicit
6666
limit to the number of references and objects that may be
@@ -79,12 +79,12 @@ SPECIFYING REFERENCES
7979

8080
'git bundle' will only package references that are shown by
8181
'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
8383
defining the basis. More than one reference may be packaged, and more
8484
than one basis can be specified. The objects packaged are those not
8585
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`).
8888

8989
It is very important that the basis used be held by the destination.
9090
It is okay to err on the side of caution, causing the bundle file
@@ -154,7 +154,7 @@ machineB$ git pull
154154
If you know up to what commit the intended recipient repository should
155155
have the necessary objects, you can use that knowledge to specify the
156156
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
158158
for this purpose, but you can use any other options that you would give to
159159
the linkgit:git-log[1] command. Here are more examples:
160160

@@ -194,7 +194,7 @@ references when fetching:
194194
$ git fetch mybundle master:localRef
195195
----------------
196196

197-
You can also see what references it offers.
197+
You can also see what references it offers:
198198

199199
----------------
200200
$ git ls-remote mybundle

0 commit comments

Comments
 (0)