X-Git-Url: https://git.jankratochvil.net/?a=blobdiff_plain;f=.gitconfig;h=e37f907271e043b881a4841ac36c95c50f2b4a63;hb=ff6cf3d6e3ed6b59ac44a229de5eecaf3d5d03c0;hp=191f05f05429dc36e2709700a734565693927b04;hpb=4aa02f02edaace035a6821b7fcd4fbb72bc8a558;p=nethome.git diff --git a/.gitconfig b/.gitconfig index 191f05f..e37f907 100644 --- a/.gitconfig +++ b/.gitconfig @@ -7,6 +7,7 @@ defaultBranch = master [merge] conflictstyle = diff3 + renamelimit = 10000 [color] ui = never [pull]