Skip to content

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.

Sign up for GitHub

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 from
May 11, 2019
Merged

Enable custom merge message formats via configuration #1488

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b5c51fc
Refactoring of merge message
Sep 28, 2018
65bac98
Enable custom merge message formats to be applied via configuration
Oct 2, 2018
6b73852
MergeMessage - Ensure return after first match
Oct 2, 2018
09dbd23
Merge branch 'master' into feature/merge-message-config
Kieranties Apr 10, 2019
76c7dda
CR: merge-messages -> merge-message-formats
Kieranties Apr 13, 2019
9cd7532
Merge branch 'master' into feature/merge-message-config
Kieranties Apr 25, 2019
3862d1f
Write log for matching mergmessage definition
Kieranties Apr 25, 2019
b82c297
CR: Correct configuration example
Kieranties Apr 26, 2019
f353dd8
CR: Whitespace correction
Kieranties Apr 26, 2019
d27bfdd
CR: Refactor MergeMessage to remove private property setters
Kieranties Apr 26, 2019
47f7b48
Merge branch 'master' into feature/merge-message-config
Kieranties Apr 26, 2019
c22e1ec
Revert "Merge pull request #1591 from asbjornu/feature/tfs-merge-mess…
Kieranties May 10, 2019
09b656c
CR: Use private class for merge message patterns
Kieranties May 11, 2019
629efff
CR: Clean up naming within MergeMessage class
Kieranties May 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
CR: Correct configuration example
  • Loading branch information
@Kieranties
Kieranties committed Apr 26, 2019
commit b82c2977a899692b321ea4d94deb5914ac4bd6ad
2 changes: 1 addition & 1 deletion docs/configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ commit-date-format: 'yyyy-MM-dd'
ignore:
sha: []
commits-before: yyyy-MM-ddTHH:mm:ss
merge-messages: {}
merge-message-formats: {}
```

And the description of the available options are:
Expand Down