renames!

1 files changed, 13 insertions, 0 deletions

diff --git a/include/git2/merge.h b/include/git2/merge.h
index 43a61f0e4..8ca90b95f 100644
--- a/include/git2/merge.h
+++ b/include/git2/merge.h
@@ -27,6 +27,8 @@ GIT_BEGIN_DECL
  * passed in via the `flags` value in the `git_diff_tree_many_options`.
  */
 typedef enum {
+	/** Detect renames */
+	GIT_MERGE_TREE_FIND_RENAMES = (1 << 0),
 } git_merge_tree_flags;
 
 /**
@@ -44,6 +46,17 @@ typedef struct {
 	unsigned int version;
 	git_merge_tree_flags flags;
 	
+	/** Similarity to consider a file renamed (default 50) */
+	unsigned int rename_threshold;
+	
+	/** Maximum similarity sources to examine (overrides the
+	 * `merge.renameLimit` config) (default 200)
+	 */
+	unsigned int target_limit;
+
+    /** Pluggable similarity metric; pass NULL to use internal metric */
+	git_diff_similarity_metric *metric;
+	
 	/** Flags for automerging content. */
 	git_merge_automerge_flags automerge_flags;
 } git_merge_tree_opts;