Skip to content

Commit 687eb75

Browse files
committed
Updated Git configuration
1 parent 9c882e1 commit 687eb75

File tree

2 files changed

+89
-82
lines changed

2 files changed

+89
-82
lines changed

.gitattributes

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# Set default behaviour, in case users don't have core.autocrlf set.
2+
* text=auto
3+
4+
# Explicitly declare text files we want to always be normalized and converted to native line endings on checkout.
5+
# These files are text and should be normalized (Convert crlf => lf)
6+
*.java text
7+
*.properties text
8+
*.sh text
9+
*.md text
10+
*.info text
11+
*.txt text
12+
*.json text
13+
14+
# Denote all files that are truly binary and should not be modified.
15+
# (binary is a macro for -text -diff)
16+
*.class binary
17+
*.gif binary
18+
*.ico binary
19+
*.jar binary
20+
*.jpg binary
21+
*.jpeg binary
22+
*.png binary
23+
24+
# Make sure Windows batch files preserve CR/LF line endings, otherwise they may not be able to execute. Windows
25+
# batch files require a CR/LF for labels to work properly, otherwise they may fail when labels straddle 512-byte
26+
# block boundaries. This is important when files are downloaded through a zip archive that was authored on a
27+
# Linux machine (the default behavior on GitHub)
28+
*.bat eol=crlf

.gitignore

+61-82
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,69 @@
1-
# Log file
2-
*.log
31

4-
# BlueJ files
5-
*.ctxt
6-
7-
# Mobile Tools for Java (J2ME)
8-
.mtj.tmp/
9-
10-
# Package Files #
11-
*.war
12-
*.ear
13-
*.tar.gz
14-
*.rar
15-
16-
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
17-
hs_err_pid*
18-
19-
20-
# ignore gradle artifacts
21-
.gradle/
22-
gradlew.bat
23-
build/libs/
24-
build/tmp/
25-
26-
# test scripts
27-
test.bat
28-
29-
target/
30-
combined-batch.bat
31-
32-
# IDEA files
33-
.idea/
34-
jterm.iml
35-
36-
# eclipse files
37-
.classpath
38-
.project
39-
.settings
40-
41-
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
42-
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
43-
44-
# User-specific stuff:
45-
.idea/**/workspace.xml
46-
.idea/**/tasks.xml
47-
.idea/dictionaries
48-
49-
# Sensitive or high-churn files:
50-
.idea/**/dataSources/
51-
.idea/**/dataSources.ids
52-
.idea/**/dataSources.xml
53-
.idea/**/dataSources.local.xml
54-
.idea/**/sqlDataSources.xml
55-
.idea/**/dynamic.xml
56-
.idea/**/uiDesigner.xml
57-
58-
# Gradle:
59-
.idea/**/gradle.xml
60-
.idea/**/libraries
61-
62-
# CMake
63-
cmake-build-debug/
64-
65-
# Mongo Explorer plugin:
66-
.idea/**/mongoSettings.xml
67-
68-
## File-based project format:
2+
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
3+
#
4+
# If you find yourself ignoring temporary files generated by your text editor
5+
# or operating system, you probably want to add a global ignore instead:
6+
# git config --global core.excludesfile '~/.gitignore_global'
7+
8+
# Ignore files that are not wanted in general
9+
.*
10+
_MACOSX
11+
*.db
12+
13+
# Don't ignore GitHub files
14+
!.github
15+
!.gitignore
16+
!.gitattributes
17+
18+
# or EditorConfig
19+
!.editorconfig
20+
21+
# Ignore Eclipse files
22+
/bin/
23+
tmp/
24+
*.tmp
25+
*.bak
26+
*.swp
27+
*~.nib
28+
local.properties
29+
*.launch
30+
31+
# Ignore IntelliJ IDEA files
32+
*.iml
33+
*.ipr
6934
*.iws
70-
71-
## Plugin-specific files:
72-
73-
# IntelliJ
74-
out/
75-
76-
# mpeltonen/sbt-idea plugin
77-
.idea_modules/
78-
79-
# JIRA plugin
35+
/out/
8036
atlassian-ide-plugin.xml
81-
82-
# Cursive Clojure plugin
83-
.idea/replstate.xml
84-
85-
# Crashlytics plugin (for Android Studio and IntelliJ)
8637
com_crashlytics_export_strings.xml
8738
crashlytics.properties
8839
crashlytics-build.properties
8940
fabric.properties
9041

42+
# Ignore NetBeans files
43+
nbproject/private/
44+
/build/
45+
nbbuild/
46+
/dist/
47+
nbdist/
48+
nbactions.xml
49+
nb-configuration.xml
50+
51+
# Ignore JVM crash logs
52+
hs_err_pid*
53+
54+
# Ignore generic & archive binaries
55+
*.7z
56+
*.dmg
57+
*.gz
58+
*.iso
59+
*.jar
60+
*.rar
61+
*.tar
62+
*.zip
63+
*.war
64+
*.ear
65+
*.sar
66+
*.class
67+
68+
# Project-specific dependencies
69+
/target/

0 commit comments

Comments
 (0)