summaryrefslogtreecommitdiff
path: root/src/merge.h
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@microsoft.com>2013-12-02 11:15:27 -0500
committerEdward Thomson <ethomson@edwardthomson.com>2013-12-02 16:57:41 -0600
commit300d192f7ed45112121f2a35d5ca80a4913c7aad (patch)
treea3000995c66950ae009cd3e7f24153bf3683fb78 /src/merge.h
parent14984af6cb9906746d2c64c5df7542ecd7406b16 (diff)
downloadlibgit2-300d192f7ed45112121f2a35d5ca80a4913c7aad.tar.gz
Introduce git_revert to revert a single commit
Diffstat (limited to 'src/merge.h')
-rw-r--r--src/merge.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/merge.h b/src/merge.h
index d7d1c67b7..b240f6c44 100644
--- a/src/merge.h
+++ b/src/merge.h
@@ -158,4 +158,6 @@ int git_merge__setup(
size_t their_heads_len,
unsigned int flags);
+int git_merge__indexes(git_repository *repo, git_index *index_new);
+
#endif