diff options
author | crumblycake <angusbjones@outlook.com> | 2013-12-05 15:31:18 +0400 |
---|---|---|
committer | Jameson Miller <jamill@microsoft.com> | 2014-01-16 18:21:49 +0400 |
commit | cc4bb2da1de35122860993cb1f5c9fae7a724f59 (patch) | |
tree | d3f68c1c7949cd544af2d3a588797b45861b499d /LibGit2Sharp/IRepository.cs | |
parent | 9165ae30d4cff10681b5b65f094d0d4320426b6e (diff) |
Initial merge functionality.
Bring initial merge functionality to LibGit2Sharp.
Diffstat (limited to 'LibGit2Sharp/IRepository.cs')
-rw-r--r-- | LibGit2Sharp/IRepository.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/LibGit2Sharp/IRepository.cs b/LibGit2Sharp/IRepository.cs index 9c3c9f31..952e1f64 100644 --- a/LibGit2Sharp/IRepository.cs +++ b/LibGit2Sharp/IRepository.cs @@ -194,6 +194,13 @@ namespace LibGit2Sharp IEnumerable<MergeHead> MergeHeads { get; } /// <summary> + /// Merges the given commit into HEAD. + /// </summary> + /// <param name="commit">The commit to use as a reference for the changes that should be merged into HEAD.</param> + /// <param name="merger">If the merge generates a merge commit (i.e. a non-fast forward merge), the <see cref="Signature"/> of who made the merge.</param> + MergeResult Merge(Commit commit, Signature merger); + + /// <summary> /// Manipulate the currently ignored files. /// </summary> Ignore Ignore { get; } |