X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=.gitconfig;h=e37f907271e043b881a4841ac36c95c50f2b4a63;hp=dfaec756b75d5792685fa0ff51eda1623548344a;hb=HEAD;hpb=130720a063b17573d87ddb11cadfb59544d17afe

diff --git a/.gitconfig b/.gitconfig
index dfaec75..dfa6b16 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,25 +1,20 @@
 [user]
 	name = Jan Kratochvil
-	email = jan@jankratochvil.net
+# use: .gitconfig.local
+#	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