This website requires JavaScript.
Explore
Help
Sign In
gitlab
/
omnibus-gitlab
mirror of
https://gitlab.com/gitlab-org/omnibus-gitlab.git
Watch
1
Star
0
Fork
You've already forked omnibus-gitlab
0
Code
Issues
Packages
Projects
Releases
Wiki
Activity
master
omnibus-gitlab
/
.gitattributes
3 lines
60 B
Plaintext
Raw
Permalink
Normal View
History
Unescape
Escape
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