diff options
Diffstat (limited to 'README.git')
| -rw-r--r-- | README.git | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/README.git b/README.git index 2bed537d2..b4c0703ea 100644 --- a/README.git +++ b/README.git @@ -72,26 +72,6 @@ to execute `autogen.sh` in advance; this script clones the 'dlg' git submodule and copies some files into FreeType's source tree. -contributing ------------- - -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-2021 by |