Small git tweaks #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I see no reason this can't be merged. Mike, merge it in after you review. Thanks Rob. |
|
Note, I need to add some fixes to my last commits, I will apply them to this release once this merge has been applied, and make a pull request. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@mdietze @rgknox final tweaks for git.
I tweaked the .gitignore file (which was .bzrignore) before and combined some of the exclude files into more generic rules, for example *.o to ignore all .o files, and /bin/.[Ff]90 to ignore all f90 files in the bin folders (put there during the compile process). I also added *
, # and .nfs as generic ignore rules. I deleted any of *files since those are backup files.I setup a .gitattributes file which lists some explicit file types, for example all .[fF]90 files are to be treated as ascii files and should try to use a diff program that can handle fortran code. I also add a specific rule for .m files to be text and use matlab aware diff program, and .mat to be binary. Some of the .m files had CR-LF as line endings (used under windows) that got changed to be LF. If you check out the repository though, git is smart enough to add CR-LF on a windows machine.