summaryrefslogtreecommitdiff
path: root/.gitattributes
Commit message (Collapse)AuthorAgeFilesLines
* Remove gitattribute entry for CHANGELOG.mdrs-disable-changelog-mergeRobert Speicher2016-11-151-1/+0
| | | | [ci skip]
* Convert CHANGELOG to MarkdownRobert Speicher2016-10-161-1/+1
| | | | | | | | | All this does is convert the version sections into headers. The list items shouldn't really be indented by two spaces, but it makes no difference to the rendering and this way we retain authorship history for the actual changes. Related to https://gitlab.com/gitlab-org/release-tools/merge_requests/29
* Added '*.js.es6 gitlab-language=javascript' to .gitattributesLuke Bennett2016-07-261-1/+2
|
* Use gitattribute merge=union to reduce CHANGELOG merge conflicts.Douwe Maan2015-02-121-0/+1