+.config/yt-dlp.conf

[nethome.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index dfaec75..dfa6b16 100644 (file)
--- 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