AuroraMiddleware/freetype
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

.gitattributes: New file.

Browse Source 
We use this to handle ChangeLog files with the `git-merge-changelog`
program.
This commit is contained in:
Werner Lemberg 2021-01-16 08:57:33 +01:00
parent 89184195b4
commit b0f86752a5
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
ChangeLog merge=merge-changelog

17
README.git
View File

@ -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