4 files changed, 26 insertions, 5 deletions
diff --git a/docs/git2/Index.luadoc b/docs/git2/Index.luadoc
index bfa51cc..fe961e5 100644
--- a/docs/git2/Index.luadoc
+++ b/docs/git2/Index.luadoc
@@ -166,9 +166,10 @@ end
 --
 -- <p>Calls <a href="http://libgit2.github.com/libgit2/#HEAD/group/index/git_index_read_tree">git_index_read_tree</a>:<p><p>The current index contents will be replaced by the specified tree.
 -- @param tree tree to read.  Must be of type <a href="Tree.html">Tree</a>.
+-- @param should_be_null Must be of type <code>lightuserdata</code>.
 -- @return <code>true</code> if no error.
 -- @return Error string.
 -- @name Index:read_tree
-function Index:read_tree(tree)
+function Index:read_tree(tree, should_be_null)
 end
 
diff --git a/docs/git2/Repository.luadoc b/docs/git2/Repository.luadoc
index 3be21a3..5273e7d 100644
--- a/docs/git2/Repository.luadoc
+++ b/docs/git2/Repository.luadoc
@@ -100,10 +100,11 @@ end
 --  all the common workdir operations (checkout, status, index
 --  manipulation, etc).
 -- @param workdir The path to a working directory.  Must be of type <code>string</code>.
+-- @param update_gitlink Must be of type <code>integer</code>.
 -- @return <code>true</code> if no error.
 -- @return Error string.
 -- @name Repository:set_workdir
-function Repository:set_workdir(workdir)
+function Repository:set_workdir(workdir, update_gitlink)
 end
 
 --- object method.
diff --git a/docs/git2/TreeEntry.luadoc b/docs/git2/TreeEntry.luadoc
index 7fb85ea..73ee453 100644
--- a/docs/git2/TreeEntry.luadoc
+++ b/docs/git2/TreeEntry.luadoc
@@ -16,10 +16,9 @@ end
 
 --- 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>
 -- @return <code>integer</code>.
--- @name TreeEntry:attributes
-function TreeEntry:attributes()
+-- @name TreeEntry:filemode
+function TreeEntry:filemode()
 end
 
 --- object method.
diff --git a/docs/git2/merge.luadoc b/docs/git2/merge.luadoc
new file mode 100644
index 0000000..0b10806
--- /dev/null
+++ b/docs/git2/merge.luadoc
@@ -0,0 +1,20 @@
+--
+-- Warning: AUTOGENERATED DOCS.
+--
+
+--- Class "merge".
+--
+module("merge")
+
+--- module function.
+--
+-- <p>Calls <a href="http://libgit2.github.com/libgit2/#HEAD/group/merge/git_merge_base">git_merge_base</a>:<p><p>
+-- @param repo the repository where the commits exist.  Must be of type <a href="Repository.html">Repository</a>.
+-- @param one one of the commits.  Must be of type <a href="OID.html">OID</a>.
+-- @param two the other commit.  Must be of type <a href="OID.html">OID</a>.
+-- @return <a href="OID.html">OID</a> or <code>nil</code> on error.
+-- @return Error string.
+-- @name merge.base
+function merge.base(repo, one, two)
+end
+