touch merge change logs

diff --git a/.gitattributes b/.gitattributes
new file mode 100644 (file)
index 0000000..274345e
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+/ChangeLog*                                            merge=touch
+/docs/sources/ChangeLog*               merge=touch
+/docs/sources/issues.rst               merge=touch

diff --git a/git-config.sh b/git-config.sh
new file mode 100755 (executable)
index 0000000..3ab3cec
--- /dev/null
+++ b/git-config.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+git config merge.touch.name = "Keep this file"
+git config merge.touch.driver = "touch %A"