X-Git-Url: http://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=.gitconfig;fp=.gitconfig;h=dfaec756b75d5792685fa0ff51eda1623548344a;hp=16ba20bfdf97f56689f4453df88bab3eb03ecc8a;hb=130720a063b17573d87ddb11cadfb59544d17afe;hpb=0f973ac5584b8a30a0bf3c87d997ed977aead8c2 diff --git a/.gitconfig b/.gitconfig index 16ba20b..dfaec75 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,6 +1,10 @@ [user] name = Jan Kratochvil - email = jan.kratochvil@redhat.com + email = jan@jankratochvil.net +[include] + path = .gitconfig.local +[init] + defaultBranch = master [merge] conflictstyle = diff3 [color]