diff --git a/.chglog/CHANGELOG.tpl.md b/.chglog/CHANGELOG.tpl.md index d75abe5..569adee 100755 --- a/.chglog/CHANGELOG.tpl.md +++ b/.chglog/CHANGELOG.tpl.md @@ -18,14 +18,6 @@ {{ end }} {{ end -}} -{{- if .MergeCommits -}} -### Merge Requests - -{{ range .MergeCommits -}} -* {{ .Header }} -{{ end }} -{{ end -}} - {{- if .NoteGroups -}} {{ range .NoteGroups -}} ### {{ .Title }} diff --git a/.chglog/config.yml b/.chglog/config.yml index 5cfabf4..1a2507d 100755 --- a/.chglog/config.yml +++ b/.chglog/config.yml @@ -12,16 +12,21 @@ options: # - perf # - refactor commit_groups: - # title_maps: - # feat: Features - # fix: Bug Fixes - # perf: Performance Improvements - # refactor: Code Refactoring + title_maps: + feat: Features + fix: Bug Fixes + perf: Performance Improvements + refactor: Code Refactoring + chore: Housework + build: Build System + docs: Documentation + style: Code Style + test: Testing header: - pattern: "^((\\w+)\\s.*)$" + pattern: "^(\\w*)\\:\\s(.*)$" pattern_maps: - - Subject - Type + - Subject notes: keywords: - - BREAKING CHANGE \ No newline at end of file + - BREAKING CHANGE