diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-05-14 01:03:59 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-05-14 01:03:59 +0900 |
commit | 792b6092433e1d94ae2e4b9e83a333bf2d0425a2 (patch) | |
tree | 209af2f2e426a0c7028c1ea3cd9633cf3c85da88 /gitrevisions.html | |
parent | d1063b1b2e658ecbb78ae560ecb80d543e8c78c5 (diff) | |
download | git-htmldocs-792b6092433e1d94ae2e4b9e83a333bf2d0425a2.tar.gz |
Autogenerated HTML docs for v2.22.0-rc0
Diffstat (limited to 'gitrevisions.html')
-rw-r--r-- | gitrevisions.html | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/gitrevisions.html b/gitrevisions.html index 04363863b..5089eaa56 100644 --- a/gitrevisions.html +++ b/gitrevisions.html @@ -877,7 +877,7 @@ some output processing may assume ref names in UTF-8.</p></div> </p>
</dd>
<dt class="hdlist1">
-<em><refname>@{<date>}</em>, e.g. <em>master@{yesterday}</em>, <em>HEAD@{5 minutes ago}</em>
+<em>[<refname>]@{<date>}</em>, e.g. <em>master@{yesterday}</em>, <em>HEAD@{5 minutes ago}</em>
</dt>
<dd>
<p>
@@ -927,7 +927,7 @@ some output processing may assume ref names in UTF-8.</p></div> </p>
</dd>
<dt class="hdlist1">
-<em><branchname>@{upstream}</em>, e.g. <em>master@{upstream}</em>, <em>@{u}</em>
+<em>[<branchname>]@{upstream}</em>, e.g. <em>master@{upstream}</em>, <em>@{u}</em>
</dt>
<dd>
<p>
@@ -940,7 +940,7 @@ some output processing may assume ref names in UTF-8.</p></div> </p>
</dd>
<dt class="hdlist1">
-<em><branchname>@{push}</em>, e.g. <em>master@{push}</em>, <em>@{push}</em>
+<em>[<branchname>]@{push}</em>, e.g. <em>master@{push}</em>, <em>@{push}</em>
</dt>
<dd>
<p>
@@ -970,7 +970,7 @@ from one location and push to another. In a non-triangular workflow, thing no matter the case.</p></div>
</dd>
<dt class="hdlist1">
-<em><rev>^</em>, e.g. <em>HEAD^, v1.5.1^0</em>
+<em><rev>^[<n>]</em>, e.g. <em>HEAD^, v1.5.1^0</em>
</dt>
<dd>
<p>
@@ -983,10 +983,12 @@ thing no matter the case.</p></div> </p>
</dd>
<dt class="hdlist1">
-<em><rev>~<n></em>, e.g. <em>master~3</em>
+<em><rev>~[<n>]</em>, e.g. <em>HEAD~, master~3</em>
</dt>
<dd>
<p>
+ A suffix <em>~</em> to a revision parameter means the first parent of
+ that commit object.
A suffix <em>~<n></em> to a revision parameter means the commit
object that is the <n>th generation ancestor of the named
commit object, following only the first parents. I.e. <em><rev>~3</em> is
@@ -1011,11 +1013,11 @@ thing no matter the case.</p></div> <em><rev>^0</em>
is a short-hand for <em><rev>^{commit}</em>.
</p>
-<div class="paragraph"><p><em>rev^{object}</em> can be used to make sure <em>rev</em> names an
-object that exists, without requiring <em>rev</em> to be a tag, and
-without dereferencing <em>rev</em>; because a tag is already an object,
+<div class="paragraph"><p><em><rev>^{object}</em> can be used to make sure <em><rev></em> names an
+object that exists, without requiring <em><rev></em> to be a tag, and
+without dereferencing <em><rev></em>; because a tag is already an object,
it does not have to be dereferenced even once to get to an object.</p></div>
-<div class="paragraph"><p><em>rev^{tag}</em> can be used to ensure that <em>rev</em> identifies an
+<div class="paragraph"><p><em><rev>^{tag}</em> can be used to ensure that <em><rev></em> identifies an
existing tag object.</p></div>
</dd>
<dt class="hdlist1">
@@ -1061,16 +1063,13 @@ existing tag object.</p></div> </p>
</dd>
<dt class="hdlist1">
-<em><rev>:<path></em>, e.g. <em>HEAD:README</em>, <em>:README</em>, <em>master:./README</em>
+<em><rev>:<path></em>, e.g. <em>HEAD:README</em>, <em>master:./README</em>
</dt>
<dd>
<p>
A suffix <em>:</em> followed by a path names the blob or tree
at the given path in the tree-ish object named by the part
before the colon.
- <em>:path</em> (with an empty part before the colon)
- is a special case of the syntax described next: content
- recorded in the index at the given path.
A path starting with <em>./</em> or <em>../</em> is relative to the current working directory.
The given path will be converted to be relative to the working tree’s root directory.
This is most useful to address a blob or tree from a commit or tree that has
@@ -1078,7 +1077,7 @@ existing tag object.</p></div> </p>
</dd>
<dt class="hdlist1">
-<em>:<n>:<path></em>, e.g. <em>:0:README</em>, <em>:README</em>
+<em>:[<n>:]<path></em>, e.g. <em>:0:README</em>, <em>:README</em>
</dt>
<dd>
<p>
@@ -1192,7 +1191,7 @@ for naming a set that is formed by a commit and its parent commits.</p></div> <div class="paragraph"><p>The <em>r1^@</em> notation means all parents of <em>r1</em>.</p></div>
<div class="paragraph"><p>The <em>r1^!</em> notation includes commit <em>r1</em> but excludes all of its parents.
By itself, this notation denotes the single commit <em>r1</em>.</p></div>
-<div class="paragraph"><p>The <em><rev>^-<n></em> notation includes <em><rev></em> but excludes the <n>th
+<div class="paragraph"><p>The <em><rev>^-[<n>]</em> notation includes <em><rev></em> but excludes the <n>th
parent (i.e. a shorthand for <em><rev>^<n>..<rev></em>), with <em><n></em> = 1 if
not given. This is typically useful for merge commits where you
can just pass <em><commit>^-</em> to get all the commits in the branch
|