[user]
name = Jan Kratochvil
- email = jan.kratochvil@redhat.com
+ email = jan@jankratochvil.net
+[include]
+ path = .gitconfig.local
+[init]
+ defaultBranch = master
[merge]
conflictstyle = diff3
[color]
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