summaryrefslogtreecommitdiffstats
path: root/git-rev-parse.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-13 15:00:05 -0700
committerJunio C Hamano <gitster@pobox.com>2016-07-13 15:00:05 -0700
commit92d80370646a0ce43b0c769027492b3c891090aa (patch)
treecee7315334fee3145cb4badcc7a400e3e763fbac /git-rev-parse.html
parent48931e26012d8d7ad1a7e1d9701f52be1b77e45a (diff)
downloadgit-htmldocs-92d80370646a0ce43b0c769027492b3c891090aa.tar.gz
Autogenerated HTML docs for v2.9.1-273-g79ed4
Diffstat (limited to 'git-rev-parse.html')
-rw-r--r--git-rev-parse.html26
1 files changed, 13 insertions, 13 deletions
diff --git a/git-rev-parse.html b/git-rev-parse.html
index 702e122c4..7ddf0ba0e 100644
--- a/git-rev-parse.html
+++ b/git-rev-parse.html
@@ -1282,8 +1282,8 @@ blobs contained in a commit.</p></div>
<li>
<p>
If <em>$GIT_DIR/&lt;refname&gt;</em> exists, that is what you mean (this is usually
- useful only for <em>HEAD</em>, <em>FETCH_HEAD</em>, <em>ORIG_HEAD</em>, <em>MERGE_HEAD</em>
- and <em>CHERRY_PICK_HEAD</em>);
+ useful only for <code>HEAD</code>, <code>FETCH_HEAD</code>, <code>ORIG_HEAD</code>, <code>MERGE_HEAD</code>
+ and <code>CHERRY_PICK_HEAD</code>);
</p>
</li>
<li>
@@ -1310,16 +1310,16 @@ otherwise, <em>refs/remotes/&lt;refname&gt;</em> if it exists;
<p>
otherwise, <em>refs/remotes/&lt;refname&gt;/HEAD</em> if it exists.
</p>
-<div class="paragraph"><p><em>HEAD</em> names the commit on which you based the changes in the working tree.
-<em>FETCH_HEAD</em> records the branch which you fetched from a remote repository
+<div class="paragraph"><p><code>HEAD</code> names the commit on which you based the changes in the working tree.
+<code>FETCH_HEAD</code> records the branch which you fetched from a remote repository
with your last <code>git fetch</code> invocation.
-<em>ORIG_HEAD</em> is created by commands that move your <em>HEAD</em> in a drastic
-way, to record the position of the <em>HEAD</em> before their operation, so that
+<code>ORIG_HEAD</code> is created by commands that move your <code>HEAD</code> in a drastic
+way, to record the position of the <code>HEAD</code> before their operation, so that
you can easily change the tip of the branch back to the state before you ran
them.
-<em>MERGE_HEAD</em> records the commit(s) which you are merging into your branch
+<code>MERGE_HEAD</code> records the commit(s) which you are merging into your branch
when you run <code>git merge</code>.
-<em>CHERRY_PICK_HEAD</em> records the commit which you are cherry-picking
+<code>CHERRY_PICK_HEAD</code> records the commit which you are cherry-picking
when you run <code>git cherry-pick</code>.</p></div>
<div class="paragraph"><p>Note that any of the <em>refs/*</em> cases above may come either from
the <em>$GIT_DIR/refs</em> directory or from the <em>$GIT_DIR/packed-refs</em> file.
@@ -1333,7 +1333,7 @@ some output processing may assume ref names in UTF-8.</p></div>
</dt>
<dd>
<p>
- <em>@</em> alone is a shortcut for <em>HEAD</em>.
+ <em>@</em> alone is a shortcut for <code>HEAD</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -1350,7 +1350,7 @@ some output processing may assume ref names in UTF-8.</p></div>
existing log (<em>$GIT_DIR/logs/&lt;ref&gt;</em>). Note that this looks up the state
of your <strong>local</strong> ref at a given time; e.g., what was in your local
<em>master</em> branch last week. If you want to look at commits made during
- certain times, see <em>--since</em> and <em>--until</em>.
+ certain times, see <code>--since</code> and <code>--until</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -1405,7 +1405,7 @@ some output processing may assume ref names in UTF-8.</p></div>
<p>
The suffix <em>@{push}</em> reports the branch "where we would push to" if
<code>git push</code> were run while <code>branchname</code> was checked out (or the current
- <em>HEAD</em> if no branchname is specified). Since our push destination is
+ <code>HEAD</code> if no branchname is specified). Since our push destination is
in a remote repository, of course, we report the local tracking branch
that corresponds to that branch (i.e., something in <em>refs/remotes/</em>).
</p>
@@ -1635,7 +1635,7 @@ all of its parents.</p></div>
<p>
Include commits that are reachable from &lt;rev2&gt; but exclude
those that are reachable from &lt;rev1&gt;. When either &lt;rev1&gt; or
- &lt;rev2&gt; is omitted, it defaults to <em>HEAD</em>.
+ &lt;rev2&gt; is omitted, it defaults to <code>HEAD</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -1645,7 +1645,7 @@ all of its parents.</p></div>
<p>
Include commits that are reachable from either &lt;rev1&gt; or
&lt;rev2&gt; but exclude those that are reachable from both. When
- either &lt;rev1&gt; or &lt;rev2&gt; is omitted, it defaults to <em>HEAD</em>.
+ either &lt;rev1&gt; or &lt;rev2&gt; is omitted, it defaults to <code>HEAD</code>.
</p>
</dd>
<dt class="hdlist1">