From: Michael Wallner <mike@php.net>
Date: Wed, 15 Sep 2021 13:27:47 +0000 (+0200)
Subject: touch merge change logs
X-Git-Tag: 1.1.1~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=a29ba11e1c6f8ff34f5c6e42e6f7df93b5a87e0d;p=awesomized%2Flibmemcached

touch merge change logs
---

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..274345ed
--- /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
index 00000000..3ab3cecf
--- /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"