summaryrefslogtreecommitdiff
path: root/gnulib/.gitattributes
diff options
context:
space:
mode:
Diffstat (limited to 'gnulib/.gitattributes')
m---------gnulib0
-rw-r--r--gnulib/.gitattributes6
2 files changed, 6 insertions, 0 deletions
diff --git a/gnulib b/gnulib
deleted file mode 160000
-Subproject 443bc5ffcf7429e557f4a371b0661abe98ddbc1
diff --git a/gnulib/.gitattributes b/gnulib/.gitattributes
new file mode 100644
index 0000000..35a14df
--- /dev/null
+++ b/gnulib/.gitattributes
@@ -0,0 +1,6 @@
+# See lib/git-merge-changelog.c for making this useful.
+ChangeLog merge=merge-changelog
+
+# Run this to make 'git diff' on texinfo files give nicer hunk context:
+# git config diff.texinfo.funcname '^@node[ ][ ]*\\([^,][^,]*\\)'
+*.texi* diff=texinfo