gitlab
/
omnibus-gitlab
mirror of https://gitlab.com/gitlab-org/omnibus-gitlab.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
omnibus-gitlab/.gitattributes

3 lines
60 B
Plaintext
Raw Normal View History

Update merge strategy for CHANGELOG.md https://git-scm.com/docs/gitattributes#_performing_a_three_way_merge In fee58e6556bd6d7e700347f92a42693af87a687e the file was renamed from CHANGELOG -> CHANGELOG.md and later converted to markdown. Here we update the .gitattributes to reflect the rename, as merge=union will probably reduce some of the rebase conflicts in CHANGELOG.md
2018-03-26 10:24:12 +00:00
CHANGELOG.md merge=union
Highlight .rb.templates correctly in GitLab
2016-08-01 19:33:47 +00:00
*.rb.template gitlab-language=ruby