Add Repository.merge_commits() #445
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This allows you to merge arbitrary commits, returning an index, which is useful when dealing with bare repos in which we want to merge.
|
Actually I am going to need some options, so there's a couple more commits coming. |
I've gone with taking a string and converting it because the depth of the namespacing in the libgit2 name is rather large and we don't care about the global namespace that C has; and this also lets us pass the same as the '-X' option to git-merge.
046f1f8 to
bc8b29b
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This allows you to merge arbitrary commits, returning an index, which is
useful when dealing with bare repos in which we want to merge.
I don't need to use the options in my use-case at the moment, but the structures are there in case anybody does want to add them.