ref: b0f86752a5607cdbf6465991c93943110e2bc97d
parent: 89184195b4aead0174bdf84a2ce8112687db2e75
author: Werner Lemberg <wl@gnu.org>
date: Sat Jan 16 03:57:33 EST 2021
.gitattributes: New file. We use this to handle ChangeLog files with the `git-merge-changelog` program.
--- /dev/null
+++ b/.gitattributes
@@ -1,0 +1,1 @@
+ChangeLog merge=merge-changelog
--- a/README.git
+++ b/README.git
@@ -44,6 +44,23 @@
git submodule update
+If you want to contribute to FreeType it is recommended to install the
+`git-merge-changelog` program – we use a `ChangeLog` file, which often
+prevents simple merging due to conflicts. Most GNU/Linux
+distributions have a package for this program; otherwise you can
+install it via the 'gnulib' git repository. Detailed instructions can
+be found at the beginning of
+
+ https://git.savannah.gnu.org/cgit/gnulib.git/tree/lib/git-merge-changelog.c
+
+To make it actually work, add to file `.git/config` in the FreeType
+git repository (or to your `$HOME/.gitconfig` file) the lines
+
+ [merge "merge-changelog"]
+ name = GNU-style ChangeLog merge driver
+ driver = /usr/local/bin/git-merge-changelog %O %A %B
+
+
----------------------------------------------------------------------
Copyright (C) 2005-2020 by