diff options
author | Eric Blake <ebb9@byu.net> | 2008-04-16 14:52:35 -0600 |
---|---|---|
committer | Eric Blake <ebb9@byu.net> | 2008-04-16 14:52:35 -0600 |
commit | 4f1c4fc7d4825368d526d51579fbbd807826d9c1 (patch) | |
tree | 61f4cb91833645bcf91fef0724d196e49c49d7f3 | |
parent | 85953e3b87e76d2af6e98e80f65c428bd91d01ea (diff) | |
download | libtool-4f1c4fc7d4825368d526d51579fbbd807826d9c1.tar.gz |
Make ChangeLog merges easier.
* .gitattributes: New file.
* HACKING: Mention how it helps.
Signed-off-by: Eric Blake <ebb9@byu.net>
-rw-r--r-- | .gitattributes | 1 | ||||
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | HACKING | 2 |
3 files changed, 9 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..e8495d51 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +ChangeLog merge=merge-changelog @@ -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> Allow bootstrap from git repository. @@ -191,6 +191,8 @@ yyyy-mm-dd Name of Author <email@address> (tiny change) * NEWS: Updated. 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 ====================== |