]> git.saurik.com Git - bison.git/commitdiff
projects / bison.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 78029cd)
add a .gitattributes file to use the git-merge-changelog driver
authorPaolo Bonzini <bonzini@gnu.org>
Thu, 31 Jul 2008 08:52:07 +0000 (10:52 +0200)
committerPaolo Bonzini <bonzini@gnu.org>
Thu, 31 Jul 2008 08:52:07 +0000 (10:52 +0200)
.gitattributes [new file with mode: 0644] patch | blob

diff --git a/.gitattributes b/.gitattributes
new file mode 100644 (file)
index 0000000..e8495d5
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+ChangeLog merge=merge-changelog
bison