From 6437a2e18e9464162395bc0dd5b5f4754efc7d93 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Tue, 28 Nov 2017 23:16:18 +0200 Subject: release-notes: use CHANGELOG.md Add a file CHANGELOG.md in the root Subsurface directory and track this file with the `-text merge=union` attribute. This prevents merge conflicts if release notes are added on top of the file by different commits. Also, make ReleaseNotes/ReleaseNotes.txt point to that file. Signed-off-by: Lubomir I. Ivanov --- .gitattributes | 1 + 1 file changed, 1 insertion(+) (limited to '.gitattributes') diff --git a/.gitattributes b/.gitattributes index e5ae179a9..6de7402a3 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5,3 +5,4 @@ theme/jqplot.canvasAxisTickRenderer.min.js binary theme/jqplot.highlighter.min.js binary theme/jquery.jqplot.min.js binary theme/jquery.min.js binary +CHANGELOG.md -text merge=union -- cgit v1.2.3-70-g09d2