[Git][freetype/freetype][master] ChangeLog housekeeping.

[Werner Lemberg (@wl)]

Werner Lemberg pushed to branch master at FreeType / FreeType

Commits:

• ba47af32
  by Werner Lemberg at 2021-07-25T07:07:19+02:00

  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).
  

3 changed files:

• − .gitattributes
• README.git
• ChangeLog → docs/oldlogs/ChangeLog.210

Changes:

.gitattributes deleted

---

1

-ChangeLog merge=merge-changelog

README.git

---

...	...	@@ -72,26 +72,6 @@ to execute `autogen.sh` in advance; this script clones the 'dlg' git
72	72	submodule and copies some files into FreeType's source tree.
73	73
74	74
75		-contributing
76		-------------
77		-
78		-If you want to contribute to FreeType it is recommended to install the
79		-`git-merge-changelog` program – we use a `ChangeLog` file, which often
80		-prevents simple merging due to conflicts. Most GNU/Linux
81		-distributions have a package for this program; otherwise you can
82		-install it via the 'gnulib' git repository. Detailed instructions can
83		-be found at the beginning of
84		-
85		- https://git.savannah.gnu.org/cgit/gnulib.git/tree/lib/git-merge-changelog.c
86		-
87		-To make it actually work, add to file `.git/config` in the FreeType
88		-git repository (or to your `$HOME/.gitconfig` file) the lines
89		-
90		- [merge "merge-changelog"]
91		- name = GNU-style ChangeLog merge driver
92		- driver = /usr/local/bin/git-merge-changelog %O %A %B
93		-
94		-
95	75	----------------------------------------------------------------------
96	76
97	77	Copyright (C) 2005-2021 by

ChangeLog → docs/oldlogs/ChangeLog.210

---

—
View it on GitLab.
You're receiving this email because of your account on gitlab.freedesktop.org. If you'd like to receive fewer emails, you can adjust your notification settings.