-
Notifications
You must be signed in to change notification settings - Fork 654
Enable custom merge message formats via configuration #1488
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
asbjornu
merged 14 commits into
GitTools:master
from
Kieranties:feature/merge-message-config
May 11, 2019
Merged
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
b5c51fc
Refactoring of merge message
65bac98
Enable custom merge message formats to be applied via configuration
6b73852
MergeMessage - Ensure return after first match
09dbd23
Merge branch 'master' into feature/merge-message-config
Kieranties 76c7dda
CR: merge-messages -> merge-message-formats
Kieranties 9cd7532
Merge branch 'master' into feature/merge-message-config
Kieranties 3862d1f
Write log for matching mergmessage definition
Kieranties b82c297
CR: Correct configuration example
Kieranties f353dd8
CR: Whitespace correction
Kieranties d27bfdd
CR: Refactor MergeMessage to remove private property setters
Kieranties 47f7b48
Merge branch 'master' into feature/merge-message-config
Kieranties c22e1ec
Revert "Merge pull request #1591 from asbjornu/feature/tfs-merge-mess…
Kieranties 09b656c
CR: Use private class for merge message patterns
Kieranties 629efff
CR: Clean up naming within MergeMessage class
Kieranties File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -122,3 +122,4 @@ branches: | |
ignore: | ||
sha: [] | ||
commit-date-format: yyyy-MM-dd | ||
merge-message-formats: {} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,3 +2,4 @@ next-version: 2.0.0 | |
branches: {} | ||
ignore: | ||
sha: [] | ||
merge-message-formats: {} |
Large diffs are not rendered by default.
Oops, something went wrong.
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 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 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 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
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.
Uh oh!
There was an error while loading. Please reload this page.