This is the mail archive of the
elfutils-devel@sourceware.org
mailing list for the elfutils project.
[PATCH] Specify a custom git merge driver for ChangeLog files
- From: "Dmitry V. Levin" <ldv at altlinux dot org>
- To: elfutils-devel at sourceware dot org
- Date: Mon, 19 Mar 2018 21:33:35 +0300
- Subject: [PATCH] Specify a custom git merge driver for ChangeLog files
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
---
.gitattributes | 1 +
ChangeLog | 4 ++++
2 files changed, 5 insertions(+)
create mode 100644 .gitattributes
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..ca4ea27
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+ChangeLog merge=merge-changelog
diff --git a/ChangeLog b/ChangeLog
index 279c3b2..91258e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-03-19 Dmitry V. Levin <ldv@altlinux.org>
+
+ * .gitattributes: New file.
+
2018-02-09 Joshua Watt <JPEWhacker@gmail.com>
* configure.ac (HAVE_FALLTHROUGH): New define.
--
ldv