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:17:25 -0500
commit8e046f1b3f39bd2c5bca498965c7d082057982dd (patch)
treea71cd76784235e276d7d35b686542ae723ebe593 /.config/git/attributes
parentc3dec27c4819b3b825423e5774dc044412d29222 (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