omnibus-gitlab

Author SHA1 Message Date

Author	SHA1	Message	Date
Richard Clamp	251d8421d5	Update merge strategy for CHANGELOG.md https://git-scm.com/docs/gitattributes#_performing_a_three_way_merge In `fee58e6556` 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 11:27:04 +01:00
Gabriel Mazetto	21657dd652	Highlight .rb.templates correctly in GitLab	2016-08-01 21:34:14 +02:00
Marin Jankovski	9cdef6e863	Add gitattributes file.	2015-06-12 10:18:43 +02:00

Richard Clamp

251d8421d5

Update merge strategy for CHANGELOG.md

https://git-scm.com/docs/gitattributes#_performing_a_three_way_merge

In fee58e6556 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 11:27:04 +01:00

Gabriel Mazetto 21657dd652 Highlight .rb.templates correctly in GitLab 2016-08-01 21:34:14 +02:00

Marin Jankovski 9cdef6e863 Add gitattributes file. 2015-06-12 10:18:43 +02:00

3 Commits