From b0f86752a5607cdbf6465991c93943110e2bc97d Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sat, 16 Jan 2021 08:57:33 +0100 Subject: [PATCH] .gitattributes: New file. We use this to handle ChangeLog files with the `git-merge-changelog` program. --- .gitattributes | 1 + README.git | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..31f962f66 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +ChangeLog merge=merge-changelog diff --git a/README.git b/README.git index fcf203025..d7dfdeb87 100644 --- a/README.git +++ b/README.git @@ -44,6 +44,23 @@ necessary to check out the 'dlg' library as a git submodule. 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