Update merge branches with processMergeMessageCallback#1219
Merged
johnhaley81 merged 2 commits intonodegit:masternodegit/nodegit:masterfrom Feb 26, 2017
implausible:feature/merge-message-callbackimplausible/nodegit:feature/merge-message-callbackCopy head branch name to clipboard
Merged
Update merge branches with processMergeMessageCallback#1219johnhaley81 merged 2 commits intonodegit:masternodegit/nodegit:masterfrom implausible:feature/merge-message-callbackimplausible/nodegit:feature/merge-message-callbackCopy head branch name to clipboard
johnhaley81 merged 2 commits intonodegit:masternodegit/nodegit:masterfrom
implausible:feature/merge-message-callbackimplausible/nodegit:feature/merge-message-callbackCopy head branch name to clipboard
Conversation
When merging branches, we should provide a callback that allows users to inspect and modify the message that will be used for merging. The generated merge message itself was also incorrect when compared to git core, and so has been updated to match git core.
450b074 to
96e03dc
Compare
Collaborator
|
Thanks @implausible! |
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
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.
When merging branches, we should provide a callback that allows users to inspect and modify the message that will be used for merging.
The generated merge message itself was also incorrect when compared to git core, and so has been updated to match git core.