diff options
| author |  Lubomir I. Ivanov <neolit123@gmail.com> | 2017-11-28 23:16:18 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-11-28 19:05:04 -0800 |
| commit | 6437a2e18e9464162395bc0dd5b5f4754efc7d93 (patch) | |
| tree | 021ded145edcc8481a75b09a00fdfdff487defae /.gitattributes | |
| parent | d031fbf2ea034c484dbb08e49310ae85adfeadef (diff) | |
| download | subsurface-6437a2e18e9464162395bc0dd5b5f4754efc7d93.tar.gz | |
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 <neolit123@gmail.com>
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
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 |