Commit ba47af32 authored by Werner Lemberg's avatar Werner Lemberg
Browse files

ChangeLog housekeeping.

Archive old `ChangeLog` file.

We no longer write ChangeLog entries manually; instead, the file will be
created from commit messages (which should be formatted in GNU's ChangeLog
style) by a call to

  gitlog-to-changelog --format='%B%n'

or something similar (this script is part of the 'gnulib' repository).
parent c2fa51d9
Pipeline #366698 passed with stage
in 1 minute and 13 seconds
ChangeLog merge=merge-changelog
......@@ -72,26 +72,6 @@ to execute `` in advance; this script clones the 'dlg' git
submodule and copies some files into FreeType's source tree.
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
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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment