From fc9bdf8d3793ffdb4168ca5c5c7ed97bbd5ab036 Mon Sep 17 00:00:00 2001 From: Mohammad Akhlaghi Date: Wed, 3 Jun 2020 19:47:23 +0100 Subject: Updated .gitattributes to include all files to not merge Following a test merge, I noticed that the '.gitattributes' file is not doing anything about the deleted files and also that all the files in 'tex/src/*.txt' should be added (they are too project-specific). So now it only includes the files that aren't deleted. For the files that are deleted, in the Maneage 'README-hacking.md' file, I added an AWK command to easily remove them. --- .gitattributes | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to '.gitattributes') diff --git a/.gitattributes b/.gitattributes index 280f260..1fab0e0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,5 @@ paper.tex merge=ours -tex/src/delete-me.mk merge=ours -tex/src/delete-me-demo.mk merge=ours -reproduce/analysis/make/delete-me.mk merge=ours +tex/src/*.tex merge=ours +reproduce/analysis/config/*.conf merge=ours reproduce/software/config/TARGETS.conf merge=ours -reproduce/analysis/config/delete-me-num.conf merge=ours \ No newline at end of file +reproduce/software/config/texlive-packages.conf merge=ours \ No newline at end of file -- cgit v1.2.1