aboutsummaryrefslogtreecommitdiff
path: root/.gitattributes
AgeCommit message (Collapse)AuthorLines
2020-06-03Updated .gitattributes to include all files to not mergeMohammad Akhlaghi-4/+3
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.
2020-05-01Added a .gitattributes file to avoid merging some filesMohammad Akhlaghi-0/+6
As explained in the new `README-hacking.md', this files greatly helps in avoiding un-necessary conflicts.