.ssh/config: cosmo8: -User; it is not used by Termux.

[nethome.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 5ea696d..e37f907 100644 (file)
--- 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
@@ -30,7 +28,16 @@
 [branch]
        sort = committerdate
 # FIXME: It does not work:
-[blame]
-        ignoreRevsFile = ~/.gitconfig-ignoreblamecommit
+#[blame]
+#        ignoreRevsFile = ~/.gitconfig-ignoreblamecommit
 [format]
        signature =
+
+# Big files cludge:
+#[core]
+#      compression=1
+#      bigFileThreshold=100g
+#[pack]
+#      depth=2
+#      window=2
+#      threads=1