summaryrefslogtreecommitdiff
path: root/docs/modules/TreeEntry.html
diff options
context:
space:
mode:
Diffstat (limited to 'docs/modules/TreeEntry.html')
-rw-r--r--docs/modules/TreeEntry.html10
1 files changed, 7 insertions, 3 deletions
diff --git a/docs/modules/TreeEntry.html b/docs/modules/TreeEntry.html
index 2033128..103d201 100644
--- a/docs/modules/TreeEntry.html
+++ b/docs/modules/TreeEntry.html
@@ -116,6 +116,10 @@
<a href="../modules/git2.html">git2</a>
</li>
+ <li>
+ <a href="../modules/merge.html">merge</a>
+ </li>
+
</ul>
@@ -143,7 +147,7 @@
<table class="function_list">
<tr>
- <td class="name" nowrap><a href="#TreeEntry:attributes">TreeEntry:attributes</a>&nbsp;()</td>
+ <td class="name" nowrap><a href="#TreeEntry:filemode">TreeEntry:filemode</a>&nbsp;()</td>
<td class="summary">object method.</td>
</tr>
@@ -179,9 +183,9 @@
-<dt><a name="TreeEntry:attributes"></a><strong>TreeEntry:attributes</strong>&nbsp;()</dt>
+<dt><a name="TreeEntry:filemode"></a><strong>TreeEntry:filemode</strong>&nbsp;()</dt>
<dd>
-object method. <p>Calls <a href="http://libgit2.github.com/libgit2/#HEAD/group/tree/git_tree_entry_attributes">git_tree_entry_attributes</a>:<p><p>
+object method.