touch merge change logs

awesomized · Sep 15, 2021 · a29ba11 · a29ba11
1 parent 4b22e28
commit a29ba11
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/.gitattributes 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
@@ -0,0 +1,3 @@
+#!/bin/sh
+git config merge.touch.name = "Keep this file"
+git config merge.touch.driver = "touch %A"