diff options
| author | Werner Lemberg <wl@gnu.org> | 2021-07-25 06:50:36 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2021-07-25 07:07:19 +0200 |
| commit | ba47af32ba6a8a5f2cd5c0a5868c37c6a2665c1c (patch) | |
| tree | a0515f179162bf58188382df3d4c0244fa6380fb | |
| parent | c2fa51d9bd350c55427b62982bf464ffd5e0a068 (diff) | |
| download | freetype2-ba47af32ba6a8a5f2cd5c0a5868c37c6a2665c1c.tar.gz | |
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).
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rw-r--r-- | README.git | 20 | ||||
| -rw-r--r-- | docs/oldlogs/ChangeLog.210 (renamed from ChangeLog) | 0 |
3 files changed, 0 insertions, 21 deletions
diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 31f962f66..000000000 --- a/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -ChangeLog merge=merge-changelog 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 diff --git a/ChangeLog b/docs/oldlogs/ChangeLog.210 index e649d31e2..e649d31e2 100644 --- a/ChangeLog +++ b/docs/oldlogs/ChangeLog.210 |