Documentation: remove stray backslash from "git bundle" manual
In v1.6.2.2~6^2~4 (Documentation: minor grammatical fixes and rewording in git-bundle.txt, 2009-03-22), backslashes were introduced before ~ to avoid introducing unintentional superscripts. In one paragraph there is only one ~, though, making that not a candidate for quoting, and asciidoc 8.5.8 passes the backslash through so the man page says "\~10..master". Maybe there is an asciidoc behavior change involved. In any case, we should replace tildes with a {tilde} entity which means the same thing regardless of where it is found. Reported-by: Frédéric Brière <fbriere@fbriere.net> Cc: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder committed
Aug 20, 2010 at 05:33 UTC
e1906c46697a5081a0e2d7667f5325557a477418
1 file changed
+4
-4
Documentation/git-bundle.txt
+4
-4
@@ -60,7 +60,7 @@ unbundle <file>::
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~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