diff --git a/gitconfig b/gitconfig
index 29c32c8..535bf61 100644
--- a/gitconfig
+++ b/gitconfig
@@ -23,6 +23,12 @@
 	safecrlf = true
 	eol = lf
 	pager = less -R
+	editor = vim
+[merge]
+	conflictstyle = diff3
+	renameLimit = 10000000
+[diff]
+	renameLimit = 10000000
 [alias]
 	lg = log --color --pretty=format:'%Cblue%h%Creset - %C(magenta bold)%d%Creset %s %Cgreen(%ar) %C(bold red)<%an>%Creset' --abbrev-commit --no-merges
 	graph = log --color --pretty=format:'%Cblue%h%Creset - %C(magenta bold)%d%Creset %s %Cgreen(%ar) %C(bold red)<%an>%Creset' --abbrev-commit --graph