summaryrefslogtreecommitdiff
path: root/docs/modules/git2.html
diff options
context:
space:
mode:
Diffstat (limited to 'docs/modules/git2.html')
-rw-r--r--docs/modules/git2.html6
1 files changed, 5 insertions, 1 deletions
diff --git a/docs/modules/git2.html b/docs/modules/git2.html
index 9a44134..8795a38 100644
--- a/docs/modules/git2.html
+++ b/docs/modules/git2.html
@@ -116,6 +116,10 @@
<li><strong>git2</strong></li>
+ <li>
+ <a href="../modules/merge.html">merge</a>
+ </li>
+
</ul>
@@ -133,7 +137,7 @@
<h1>Module <code>git2</code></h1>
-<p>Module git2. See <a href="http://libgit2.github.com/libgit2/#HEAD">libgit2 API docs</a>. <br />Class <a href="StrArray.html">StrArray</a> <br />Class <a href="Repository.html">Repository</a> <br />Class <a href="Config.html">Config</a> <br />Class <a href="OdbObject.html">OdbObject</a> <br />Class <a href="OID.html">OID</a> <br />Class <a href="OID_Shorten.html">OID_Shorten</a> <br />Class <a href="ODB.html">ODB</a> <br />Class <a href="ODBBackend.html">ODBBackend</a> <br />Class <a href="Index.html">Index</a> <br />Class <a href="IndexEntry.html">IndexEntry</a> <br />Class <a href="IndexEntryUnmerged.html">IndexEntryUnmerged</a> <br />Class <a href="Object.html">Object</a> <br />Class <a href="Blob.html">Blob</a> <br />Class <a href="Signature.html">Signature</a> <br />Class <a href="Commit.html">Commit</a> <br />Class <a href="Tree.html">Tree</a> <br />Class <a href="TreeEntry.html">TreeEntry</a> <br />Class <a href="Tag.html">Tag</a> <br />Class <a href="RevWalk.html">RevWalk</a> <br />Class <a href="Reference.html">Reference</a></p>
+<p>Module git2. See <a href="http://libgit2.github.com/libgit2/#HEAD">libgit2 API docs</a>. <br />Class <a href="StrArray.html">StrArray</a> <br />Class <a href="Repository.html">Repository</a> <br />Class <a href="Config.html">Config</a> <br />Class <a href="OdbObject.html">OdbObject</a> <br />Class <a href="OID.html">OID</a> <br />Class <a href="OID_Shorten.html">OID_Shorten</a> <br />Class <a href="ODB.html">ODB</a> <br />Class <a href="ODBBackend.html">ODBBackend</a> <br />Class <a href="Index.html">Index</a> <br />Class <a href="IndexEntry.html">IndexEntry</a> <br />Class <a href="IndexEntryUnmerged.html">IndexEntryUnmerged</a> <br />Class <a href="Object.html">Object</a> <br />Class <a href="Blob.html">Blob</a> <br />Class <a href="Signature.html">Signature</a> <br />Class <a href="Commit.html">Commit</a> <br />Class <a href="Tree.html">Tree</a> <br />Class <a href="TreeEntry.html">TreeEntry</a> <br />Class <a href="Tag.html">Tag</a> <br />Class <a href="RevWalk.html">RevWalk</a> <br />Class <a href="Reference.html">Reference</a> <br />Class <a href="merge.html">merge</a></p>