From: "Dmitry V. Levin" <ldv@altlinux.org>
To: elfutils-devel@sourceware.org
Subject: [PATCH] Specify a custom git merge driver for ChangeLog files
Date: Mon, 19 Mar 2018 18:33:00 -0000 [thread overview]
Message-ID: <20180319183335.GA23327@altlinux.org> (raw)
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
next reply other threads:[~2018-03-19 18:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-19 18:33 Dmitry V. Levin [this message]
2018-03-20 23:03 ` Mark Wielaard
2018-03-20 23:20 ` Dmitry V. Levin
2018-03-20 23:42 ` Dmitry V. Levin
2018-03-21 0:16 ` Mark Wielaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180319183335.GA23327@altlinux.org \
--to=ldv@altlinux.org \
--cc=elfutils-devel@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).