Skip to content

Commit 967506b

Browse files
peffgitster
authored andcommitted
Documentation: quote {non-attributes} for asciidoc
Asciidoc treats {foo} as an attribute to be substituted; if 'foo' doesn't exist as an attribute, then the entire line gets dropped. When the literal {foo} is desired, \{foo} is required. The exceptions to this rule are: - inside literal blocks - if the 'foo' contains non-alphanumeric characters (e.g., {foo|bar} is assumed not to be an attribute) Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent a2f8028 commit 967506b

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

Documentation/git-branch.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ OPTIONS
5656
-l::
5757
Create the branch's ref log. This activates recording of
5858
all changes to made the branch ref, enabling use of date
59-
based sha1 expressions such as "<branchname>@{yesterday}".
59+
based sha1 expressions such as "<branchname>@\{yesterday}".
6060

6161
-f::
6262
Force the creation of a new branch even if it means deleting

Documentation/git-checkout.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ OPTIONS
6464
-l::
6565
Create the new branch's ref log. This activates recording of
6666
all changes to made the branch ref, enabling use of date
67-
based sha1 expressions such as "<branchname>@{yesterday}".
67+
based sha1 expressions such as "<branchname>@\{yesterday}".
6868

6969
-m::
7070
If you have local modifications to one or more files that

Documentation/git-receive-pack.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ standard input of the hook will be one line per ref to be updated:
4848
The refname value is relative to $GIT_DIR; e.g. for the master
4949
head this is "refs/heads/master". The two sha1 values before
5050
each refname are the object names for the refname before and after
51-
the update. Refs to be created will have sha1-old equal to 0{40},
52-
while refs to be deleted will have sha1-new equal to 0{40}, otherwise
51+
the update. Refs to be created will have sha1-old equal to 0\{40},
52+
while refs to be deleted will have sha1-new equal to 0\{40}, otherwise
5353
sha1-old and sha1-new should be valid objects in the repository.
5454

5555
This hook is called before any refname is updated and before any
@@ -71,7 +71,7 @@ The refname parameter is relative to $GIT_DIR; e.g. for the master
7171
head this is "refs/heads/master". The two sha1 arguments are
7272
the object names for the refname before and after the update.
7373
Note that the hook is called before the refname is updated,
74-
so either sha1-old is 0{40} (meaning there is no such ref yet),
74+
so either sha1-old is 0\{40} (meaning there is no such ref yet),
7575
or it should match what is recorded in refname.
7676

7777
The hook should exit with non-zero status if it wants to disallow
@@ -96,8 +96,8 @@ The refname value is relative to $GIT_DIR; e.g. for the master
9696
head this is "refs/heads/master". The two sha1 values before
9797
each refname are the object names for the refname before and after
9898
the update. Refs that were created will have sha1-old equal to
99-
0{40}, while refs that were deleted will have sha1-new equal to
100-
0{40}, otherwise sha1-old and sha1-new should be valid objects in
99+
0\{40}, while refs that were deleted will have sha1-new equal to
100+
0\{40}, otherwise sha1-old and sha1-new should be valid objects in
101101
the repository.
102102

103103
Using this hook, it is easy to generate mails describing the updates

Documentation/git-rev-list.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,9 +284,9 @@ excluded from the output.
284284
+
285285
With '\--pretty' format other than oneline (for obvious reasons),
286286
this causes the output to have two extra lines of information
287-
taken from the reflog. By default, 'commit@{Nth}' notation is
287+
taken from the reflog. By default, 'commit@\{Nth}' notation is
288288
used in the output. When the starting commit is specified as
289-
'commit@{now}', output also uses 'commit@{timestamp}' notation
289+
'commit@{now}', output also uses 'commit@\{timestamp}' notation
290290
instead. Under '\--pretty=oneline', the commit message is
291291
prefixed with this information on the same line.
292292

0 commit comments

Comments
 (0)