summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorPaolo Bonzini <bonzini@gnu.org>2008-07-31 10:52:07 +0200
committerPaolo Bonzini <bonzini@gnu.org>2008-07-31 10:52:07 +0200
commitfdd2c97c0b6673599d2d1ea030980799a6abbb59 (patch)
treefe0186864fff0161d6d4a813ce26a4daf770c1f6 /.gitattributes
parent78029cd561557cb28cc66856afd7cc7b96ea3470 (diff)
downloadbison-fdd2c97c0b6673599d2d1ea030980799a6abbb59.tar.gz
add a .gitattributes file to use the git-merge-changelog driver
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes1
1 files changed, 1 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