git - start with global excludesfile

2016-04-26 17:11:16 +02:00 · 2016-04-26 17:11:16 +02:00 · 43ae41f493
commit 43ae41f493
parent 576aa82a5b
2 changed files with 20 additions and 3 deletions
--- a/config/gitignore
+++ b/config/gitignore
@ -0,0 +1,13 @@
+
+# Compressed files
+*.gz
+*.zip
+
+# Java
+*.jar
+*.class
+
+# C
+*.o
+a.out
+
--- a/10
+++ b/10
@ -1,7 +1,11 @@
 [user]
-	name = Felix Van der Jeugt
 	email = felix.vanderjeugt@gmail.com
-[push]
-	default = simple
+	name = Felix Van der Jeugt
 [pull]
 	rebase = true
+[merge]
+	conflictstyle = diff3
+[push]
+	default = simple
+[core]
+	excludesfile = ~/.config/gitignore