summaryrefslogtreecommitdiff
path: root/.config/git/attributes
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2017-11-08 14:13:26 -0500
committerLuke Shumaker <lukeshu@lukeshu.com>2017-11-08 14:13:26 -0500
commitbc2448409e3ac8204c29008a2f52b05f886728b5 (patch)
tree5323c1e6c477333abb9e9dfad4fc9400b6583eae /.config/git/attributes
parent117ad46b3d9211316d58a61770391b7f965896df (diff)
git: Use git-merge-changelog if available
Diffstat (limited to '.config/git/attributes')
-rw-r--r--.config/git/attributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/.config/git/attributes b/.config/git/attributes
new file mode 100644
index 0000000..56444aa
--- /dev/null
+++ b/.config/git/attributes
@@ -0,0 +1 @@
+ChangeLog merge=merge-changelog