X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=.gitconfig;h=dfa6b16faa4c48d03fb820bd2f85c82c8c61b4ef;hp=191f05f05429dc36e2709700a734565693927b04;hb=HEAD;hpb=4aa02f02edaace035a6821b7fcd4fbb72bc8a558 diff --git a/.gitconfig b/.gitconfig index 191f05f..dfa6b16 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,12 +1,14 @@ [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]