X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=.gitconfig;h=e37f907271e043b881a4841ac36c95c50f2b4a63;hp=16ba20bfdf97f56689f4453df88bab3eb03ecc8a;hb=24d7f898e5d6e1b5b33730901c3ef678dfad4c2a;hpb=0f973ac5584b8a30a0bf3c87d997ed977aead8c2

diff --git a/.gitconfig b/.gitconfig
index 16ba20b..e37f907 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,21 +1,19 @@
 [user]
 	name = Jan Kratochvil
-	email = jan.kratochvil@redhat.com
+	email = jan@jankratochvil.net
+[include]
+	path = .gitconfig.local
+[init]
+	defaultBranch = master
 [merge]
 	conflictstyle = diff3
+	renamelimit = 10000
 [color]
 	ui = never
 [pull]
 	ff = only
 #	rebase = true
 
-# ChangeLog merge attempt:
-#[merge "git-merge-changelog"]
-#	name = git-merge-changelog
-#	driver = /usr/bin/git-merge-changelog %O %A %B
-# ChangeLog merge attempt:
-#[core]
-#	attributesfile = ~/.gitattributes
 # golang:
 #[http]
 #	cookiefile = /home/jkratoch/.gitcookies