diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-06-03 19:47:23 +0100 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-06-03 19:47:23 +0100 |
| commit | fc9bdf8d3793ffdb4168ca5c5c7ed97bbd5ab036 (patch) | |
| tree | 1030d3ddc0b18037f07da98ae2dc2969a6b05bc6 /.gitattributes | |
| parent | 80e1cb81ac9a020756d82dfaa7007c4146aab64c (diff) | |
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.
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 7 |
1 files changed, 3 insertions, 4 deletions
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 |