This is the mail archive of the
cygwin-cvs@cygwin.com
mailing list for the Cygwin project.
[newlib-cygwin] Add .gitattributes
- From: Corinna Vinschen <corinna at sourceware dot org>
- To: cygwin-cvs at sourceware dot org, newlib-cvs at sourceware dot org
- Date: 9 Mar 2015 19:53:23 -0000
- Subject: [newlib-cygwin] Add .gitattributes
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=ef54a0e301c9d4a10a53f286abb82c573ca673b5
commit ef54a0e301c9d4a10a53f286abb82c573ca673b5
Author: Corinna Vinschen <vinschen@redhat.com>
Date: Mon Mar 9 20:53:11 2015 +0100
Add .gitattributes
Diff:
---
.gitattributes | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..06d51d2
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,20 @@
+# -*- conf -*-
+
+## Set merge driver for ChangeLog files
+# See gnulib's lib/git-merge-changelog.c (or git-merge-changelog(1))
+# for per-user setup instructions.
+#
+# The short version of this (optional) procedure is:
+#
+# (1) Install git-merge-changelog (this is the tricky part!)
+#
+# (2) Add something like the following to your ~/.gitconfig:
+#
+# [merge "merge-changelog"]
+# name = GNU-style ChangeLog merge driver
+# driver = git-merge-changelog %O %A %B
+#
+# (3) Enjoy mostly effortless ChangeLog merges, at least until the
+# file gets renamed again ...
+
+ChangeLog merge=merge-changelog