diff --git a/.gitattributes b/.gitattributes index 2861792..b522729 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,5 @@ /.gitattributes export-ignore /.gitignore export-ignore +/.travis.yml export-ignore /** export-subst diff --git a/makefile b/makefile index 4e05020..14041c8 100644 --- a/makefile +++ b/makefile @@ -123,7 +123,7 @@ pre_gen: sed -e 's/[[:blank:]]*$$//' mpi.c > pre_gen/mpi.c rm mpi.c -zipup: clean new_file manual poster docs +zipup: clean astyle new_file manual poster docs @# Update the index, so diff-index won't fail in case the pdf has been created. @# As the pdf creation modifies the tex files, git sometimes detects the @# modified files, but misses that it's put back to its original version.