undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mk/asciidoctor-bq-workaround'

Browse Source 
* mk/asciidoctor-bq-workaround:
  Documentation: remove unnecessary backslashes
This commit is contained in:
Junio C Hamano 2016-02-03 14:16:01 -08:00
commit 619ef648de
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Documentation/revisions.txt
View File

@ -61,11 +61,11 @@ some output processing may assume ref names in UTF-8.
'@':: '@'::
'@' alone is a shortcut for 'HEAD'. '@' alone is a shortcut for 'HEAD'.
'<refname>@\{<date>\}', e.g. 'master@\{yesterday\}', 'HEAD@\{5 minutes ago\}':: '<refname>@{<date>}', e.g. 'master@\{yesterday\}', 'HEAD@{5 minutes ago}'::
A ref followed by the suffix '@' with a date specification A ref followed by the suffix '@' with a date specification
enclosed in a brace enclosed in a brace
pair (e.g. '\{yesterday\}', '\{1 month 2 weeks 3 days 1 hour 1 pair (e.g. '\{yesterday\}', '{1 month 2 weeks 3 days 1 hour 1
second ago\}' or '\{1979-02-26 18:30:00\}') specifies the value second ago}' or '{1979-02-26 18:30:00}') specifies the value
of the ref at a prior point in time. This suffix may only be of the ref at a prior point in time. This suffix may only be
used immediately following a ref name and the ref must have an used immediately following a ref name and the ref must have an
existing log ('$GIT_DIR/logs/<ref>'). Note that this looks up the state existing log ('$GIT_DIR/logs/<ref>'). Note that this looks up the state
@ -73,7 +73,7 @@ some output processing may assume ref names in UTF-8.
'master' branch last week. If you want to look at commits made during 'master' branch last week. If you want to look at commits made during
certain times, see '--since' and '--until'. certain times, see '--since' and '--until'.
'<refname>@\{<n>\}', e.g. 'master@\{1\}':: '<refname>@{<n>}', e.g. 'master@\{1\}'::
A ref followed by the suffix '@' with an ordinal specification A ref followed by the suffix '@' with an ordinal specification
enclosed in a brace pair (e.g. '\{1\}', '\{15\}') specifies enclosed in a brace pair (e.g. '\{1\}', '\{15\}') specifies
the n-th prior value of that ref. For example 'master@\{1\}' the n-th prior value of that ref. For example 'master@\{1\}'
@ -82,13 +82,13 @@ some output processing may assume ref names in UTF-8.
immediately following a ref name and the ref must have an existing immediately following a ref name and the ref must have an existing
log ('$GIT_DIR/logs/<refname>'). log ('$GIT_DIR/logs/<refname>').
'@\{<n>\}', e.g. '@\{1\}':: '@{<n>}', e.g. '@\{1\}'::
You can use the '@' construct with an empty ref part to get at a You can use the '@' construct with an empty ref part to get at a
reflog entry of the current branch. For example, if you are on reflog entry of the current branch. For example, if you are on
branch 'blabla' then '@\{1\}' means the same as 'blabla@\{1\}'. branch 'blabla' then '@\{1\}' means the same as 'blabla@\{1\}'.
'@\{-<n>\}', e.g. '@\{-1\}':: '@{-<n>}', e.g. '@{-1}'::
The construct '@\{-<n>\}' means the <n>th branch/commit checked out The construct '@{-<n>}' means the <n>th branch/commit checked out
before the current one. before the current one.
'<branchname>@\{upstream\}', e.g. 'master@\{upstream\}', '@\{u\}':: '<branchname>@\{upstream\}', e.g. 'master@\{upstream\}', '@\{u\}'::
@ -139,7 +139,7 @@ from one location and push to another. In a non-triangular workflow,
'<rev>{caret}1{caret}1{caret}1'. See below for an illustration of '<rev>{caret}1{caret}1{caret}1'. See below for an illustration of
the usage of this form. the usage of this form.
'<rev>{caret}\{<type>\}', e.g. 'v0.99.8{caret}\{commit\}':: '<rev>{caret}{<type>}', e.g. 'v0.99.8{caret}\{commit\}'::
A suffix '{caret}' followed by an object type name enclosed in A suffix '{caret}' followed by an object type name enclosed in
brace pair means dereference the object at '<rev>' recursively until brace pair means dereference the object at '<rev>' recursively until
an object of type '<type>' is found or the object cannot be an object of type '<type>' is found or the object cannot be
@ -159,13 +159,13 @@ it does not have to be dereferenced even once to get to an object.
'rev{caret}\{tag\}' can be used to ensure that 'rev' identifies an 'rev{caret}\{tag\}' can be used to ensure that 'rev' identifies an
existing tag object. existing tag object.
'<rev>{caret}\{\}', e.g. 'v0.99.8{caret}\{\}':: '<rev>{caret}{}', e.g. 'v0.99.8{caret}{}'::
A suffix '{caret}' followed by an empty brace pair A suffix '{caret}' followed by an empty brace pair
means the object could be a tag, means the object could be a tag,
and dereference the tag recursively until a non-tag object is and dereference the tag recursively until a non-tag object is
found. found.
'<rev>{caret}\{/<text>\}', e.g. 'HEAD^{/fix nasty bug}':: '<rev>{caret}{/<text>}', e.g. 'HEAD^{/fix nasty bug}'::
A suffix '{caret}' to a revision parameter, followed by a brace A suffix '{caret}' to a revision parameter, followed by a brace
pair that contains a text led by a slash, pair that contains a text led by a slash,
is the same as the ':/fix nasty bug' syntax below except that is the same as the ':/fix nasty bug' syntax below except that