diff options
author | Edward Thomson <ethomson@microsoft.com> | 2015-01-16 19:12:07 +0300 |
---|---|---|
committer | nulltoken <emeric.fermas@gmail.com> | 2015-02-13 22:26:53 +0300 |
commit | 4d41aba6464404f4de86fc7dbd9fe899dc84dd1d (patch) | |
tree | 35436fade7f7071df84976979a4559e602fa8802 /LibGit2Sharp/Repository.cs | |
parent | 2d5cddac4d39075ebe5252b263154f7327b4ce79 (diff) |
Introduce Repository.MergeFetchedRefs
Make `Repository.MergeFetchHeads` public (with a slightly less
scary sounding name) so that a consumer may perform the mechanics
of a `Pull` in two steps.
Diffstat (limited to 'LibGit2Sharp/Repository.cs')
-rw-r--r-- | LibGit2Sharp/Repository.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/LibGit2Sharp/Repository.cs b/LibGit2Sharp/Repository.cs index b2dec10a..8e683487 100644 --- a/LibGit2Sharp/Repository.cs +++ b/LibGit2Sharp/Repository.cs @@ -1040,12 +1040,16 @@ namespace LibGit2Sharp } /// <summary> - /// Merge the current fetch heads into the branch pointed at by HEAD. + /// Merge the reference that was recently fetched. This will merge + /// the branch on the fetched remote that corresponded to the + /// current local branch when we did the fetch. This is the + /// second step in performing a pull operation (after having + /// performed said fetch). /// </summary> /// <param name="merger">The <see cref="Signature"/> of who is performing the merge.</param> /// <param name="options">Specifies optional parameters controlling merge behavior; if null, the defaults are used.</param> /// <returns>The <see cref="MergeResult"/> of the merge.</returns> - internal MergeResult MergeFetchHeads(Signature merger, MergeOptions options) + public MergeResult MergeFetchedRefs(Signature merger, MergeOptions options) { Ensure.ArgumentNotNull(merger, "merger"); |