From 37ea61467fea5588dfac3fd40030ed260b414a3b Mon Sep 17 00:00:00 2001 From: Steve Youngs Date: Sat, 4 Apr 2020 13:27:22 +1000 Subject: [PATCH] gitattributes -- Add AUCTeX items for future subtree Signed-off-by: Steve Youngs --- .gitattributes | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.gitattributes b/.gitattributes index e472ebbe..4c46329c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,23 @@ ### Package subtree magic. +## AUCTeX (not a subtree yet, but I might turn it into one beyond 11.92) +xemacs-packages/auctex/**/.gitignore merge=sxepkg +xemacs-packages/auctex/**/Makefile.in merge=sxepkg +xemacs-packages/auctex/*.in merge=sxepkg +xemacs-packages/auctex/*.spec merge=sxepkg +xemacs-packages/auctex/ChangeLog* merge=sxepkg +xemacs-packages/auctex/README.GIT merge=sxepkg +xemacs-packages/auctex/aclocal.m4 merge=sxepkg +xemacs-packages/auctex/autogen.sh merge=sxepkg +xemacs-packages/auctex/configure.ac merge=sxepkg +xemacs-packages/auctex/install-sh merge=sxepkg +xemacs-packages/auctex/mkinstalldirs merge=sxepkg +xemacs-packages/auctex/prv-emacs.el merge=sxepkg +xemacs-packages/auctex/prv-install.el merge=sxepkg +xemacs-packages/auctex/style/.nosearch merge=sxepkg +xemacs-packages/auctex/build-aux/** merge=sxepkg +xemacs-packages/auctex/tests/** merge=sxepkg + ## Riece subtree xemacs-packages/riece/.gitignore merge=sxepkg xemacs-packages/riece/.gitmodules merge=sxepkg -- 2.34.1