diff options
Diffstat (limited to 'gitglossary.html')
| -rw-r--r-- | gitglossary.html | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/gitglossary.html b/gitglossary.html index 38c2bba9e..9bd523c7a 100644 --- a/gitglossary.html +++ b/gitglossary.html @@ -1829,6 +1829,32 @@ The most notable example is <code>HEAD</code>.</p></div> </p>
</dd>
<dt class="hdlist1">
+<a id="def_special_ref"></a>special ref
+</dt>
+<dd>
+<p>
+ A ref that has different semantics than normal refs. These refs can be
+ accessed via normal Git commands but may not behave the same as a
+ normal ref in some cases.
+</p>
+<div class="paragraph"><p>The following special refs are known to Git:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+"<code>FETCH_HEAD</code>" is written by <a href="git-fetch.html">git-fetch(1)</a> or <a href="git-pull.html">git-pull(1)</a>. It
+ may refer to multiple object IDs. Each object ID is annotated with metadata
+ indicating where it was fetched from and its fetch status.
+</p>
+</li>
+<li>
+<p>
+"<code>MERGE_HEAD</code>" is written by <a href="git-merge.html">git-merge(1)</a> when resolving merge
+ conflicts. It contains all commit IDs which are being merged.
+</p>
+</li>
+</ul></div>
+</dd>
+<dt class="hdlist1">
<a id="def_submodule"></a>submodule
</dt>
<dd>
|