vc -- Build fix.

[packages] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 48f08d0..e472ebb 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,67 @@
-xemacs-packages/gnus/.gitignore merge=sxepkg
+### Package subtree magic.
+
+## Riece subtree
 xemacs-packages/riece/.gitignore merge=sxepkg
+xemacs-packages/riece/.gitmodules merge=sxepkg
+
+## Gnus subtree
+xemacs-packages/gnus/.gitignore merge=sxepkg
+xemacs-packages/gnus/lisp/dig.el merge=sxepkg
+xemacs-packages/gnus/lisp/dns-mode.el merge=sxepkg
+xemacs-packages/gnus/lisp/dns.el merge=sxepkg
+xemacs-packages/gnus/lisp/format-spec.el merge=sxepkg
+xemacs-packages/gnus/lisp/hex-util.el merge=sxepkg
+xemacs-packages/gnus/lisp/hmac-def.el merge=sxepkg
+xemacs-packages/gnus/lisp/hmac-md5.el merge=sxepkg
+xemacs-packages/gnus/lisp/md4.el merge=sxepkg
+xemacs-packages/gnus/lisp/netrc.el merge=sxepkg
+xemacs-packages/gnus/lisp/ntlm.el merge=sxepkg
+xemacs-packages/gnus/lisp/password-cache.el merge=sxepkg
+xemacs-packages/gnus/lisp/pop3.el merge=sxepkg
+xemacs-packages/gnus/lisp/proto-stream.el merge=sxepkg
+xemacs-packages/gnus/lisp/rfc2104.el merge=sxepkg
+xemacs-packages/gnus/lisp/sasl-cram.el merge=sxepkg
+xemacs-packages/gnus/lisp/sasl-digest.el merge=sxepkg
+xemacs-packages/gnus/lisp/sasl-ntlm.el merge=sxepkg
+xemacs-packages/gnus/lisp/sasl-scram-rfc.el merge=sxepkg
+xemacs-packages/gnus/lisp/sasl.el merge=sxepkg
+xemacs-packages/gnus/lisp/sha1.el merge=sxepkg
+xemacs-packages/gnus/lisp/sieve-manage.el merge=sxepkg
+xemacs-packages/gnus/lisp/sieve-mode.el merge=sxepkg
+xemacs-packages/gnus/lisp/sieve.el merge=sxepkg
+xemacs-packages/gnus/lisp/starttls.el merge=sxepkg
+xemacs-packages/gnus/lisp/tls.el merge=sxepkg
+
+
+### Diff hunk headers
+
+## Git's builtin diff hunk header styles.
+*.ad[abs] diff=ada
+*.[Cch] diff=cpp
+*.cc diff=cpp
+*.[ch]pp diff=cpp
+*.hh diff=cpp
+*.for diff=fortran
+*.html diff=html
+*.shtml diff=html
+*.xml diff=html
+*.java diff=java
+*.[HMm] diff=objc
+*.pas diff=pascal
+*.perl diff=perl
+*.pl diff=perl
+*.php diff=php
+*.py diff=python
+*.rb diff=ruby
+*.tex diff=tex
+
+## Custom diff hunk headers
+*.el diff=elisp
+*.ac diff=m4
+*.m4 diff=m4
+*.mk diff=make
+*[Mm]akefile diff=make
+Makefile.in diff=make
+*[-.]sh diff=shell
+*.texi diff=texinfo
+