Revert "Cleanup exports"

This reverts commit 03a58a4.

Author: stewid

NAMESPACE

@@ -65,6 +65,7 @@ S3method(summary,git_tag)
 S3method(summary,git_tree)
 export(add)
 export(ahead_behind)
+export(as.data.frame)
 export(blame)
 export(blob_create)
 export(branch_create)
@@ -90,6 +91,7 @@ export(cred_token)
 export(cred_user_pass)
 export(default_signature)
 export(descendant_of)
+export(diff)
 export(discover_repository)
 export(fetch)
 export(fetch_heads)
@@ -119,6 +121,7 @@ export(libgit2_version)
 export(lookup)
 export(lookup_commit)
 export(ls_tree)
+export(merge)
 export(merge_base)
 export(note_create)
 export(note_default_ref)

R/diff.R

@@ -300,3 +300,6 @@ diff.git_tree <- function(x,
           as.integer(context_lines), as.integer(interhunk_lines),
           old_prefix, new_prefix, id_abbrev, path, max_size)
 }
+
+##' @export
+base::diff

R/merge.R

@@ -104,6 +104,9 @@ merge.character <- function(x = ".", y = NULL, commit_on_success = TRUE,
     merge.git_repository(x, y, commit_on_success, merger, fail)
 }
 
+##' @export
+base::merge
+
 ##' @export
 format.git_merge_result <- function(x, ...) {
     if (isTRUE(x$up_to_date))

R/tree.R

@@ -76,6 +76,9 @@ as.data.frame.git_tree <- function(x, ...) {
                stringsAsFactors = FALSE)
 }
 
+##' @export
+base::as.data.frame
+
 ##' Coerce entries in a git_tree to a list of entry objects
 ##'
 ##' @param x The tree \code{object}