gnu/config
1
0
Fork 0
mirror of git://git.savannah.gnu.org/config.git synced 2025-05-26 09:06:38 +12:00
Code Issues Packages Projects Releases Wiki Activity

.gitattributes: specify a custom git merge driver for the ChangeLog file

Browse Source
This commit is contained in:
Dmitry V. Levin 2020-11-19 08:00:00 +00:00
parent edcc7bbb5d
commit 9aa377c2ed
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitattributes vendored Normal file
View File

@ -0,0 +1,3 @@
# See https://git.savannah.gnu.org/cgit/gnulib.git/plain/lib/git-merge-changelog.c
# for making this useful.
ChangeLog merge=merge-changelog

4
ChangeLog
View File

@ -1,3 +1,7 @@
2020-11-19 Dmitry V. Levin <ldv@altlinux.org>
* .gitattributes: New file.
2020-11-17 Dmitry V. Levin <ldv@altlinux.org> 2020-11-17 Dmitry V. Levin <ldv@altlinux.org>
* config.guess: Combine two heuristics to detect musl libc. * config.guess: Combine two heuristics to detect musl libc.