touch merge change logs

m6w6 · m6w6 · commit a29ba11e1c6f · 2021-09-15T15:27:47.000+02:00
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"

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+/ChangeLog* merge=touch`
	`2`	`+/docs/sources/ChangeLog* merge=touch`
	`3`	`+/docs/sources/issues.rst merge=touch`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#!/bin/sh`
	`2`	`+git config merge.touch.name = "Keep this file"`
	`3`	`+git config merge.touch.driver = "touch %A"`