mirror/libtool
2
0
Fork 0
mirror of git://git.savannah.gnu.org/libtool.git synced 2024-11-21 01:40:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make ChangeLog merges easier.

Browse Source 
* .gitattributes: New file.
* HACKING: Mention how it helps.

Signed-off-by: Eric Blake <ebb9@byu.net>
This commit is contained in:
Eric Blake 2008-04-16 14:52:35 -06:00
parent 85953e3b87
commit 4f1c4fc7d4
3 changed files with 9 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

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-04-16 Eric Blake <ebb9@byu.net>
Make ChangeLog merges easier.
* .gitattributes: New file.
* HACKING: Mention how it helps.
2008-04-15 Peter O'Gorman <peter@pogma.com> 2008-04-15 Peter O'Gorman <peter@pogma.com>
Allow bootstrap from git repository. Allow bootstrap from git repository.

2
HACKING
View File

@ -191,6 +191,8 @@ yyyy-mm-dd Name of Author <email@address> (tiny change)
* NEWS: Updated. * NEWS: Updated.
Reported by Bob Friesenhahn <bfriesen@simple.dallas.tx.us>. Reported by Bob Friesenhahn <bfriesen@simple.dallas.tx.us>.
* You may find it useful to install the git-merge-changelog merge driver:
http://git.sv.gnu.org/gitweb/?p=gnulib.git;a=blob;f=lib/git-merge-changelog.c
6. Editing `.am' Files 6. Editing `.am' Files
====================== ======================