Add more stuff to gitconfig

2018-11-26 17:30:15 +01:00 · 2018-11-26 17:30:15 +01:00 · ee35298a03
parent 85cb17a8af
commit ee35298a03
1 changed files with 10 additions and 2 deletions
--- a/12
+++ b/12
@ -1,5 +1,15 @@
+# vim: set filetype=gitconfig :miv #
 [core]
 	editor = gvim -f
+[diff]
+	tool = gvim
+[difftool]
+	confirm = false
+	prompt = false
+[merge]
+	tool = gvimdiff3
+[push]
+	default = matching
 [alias]
 	adog = log --all --decorate --oneline --graph
  ten = log --all --decorate --oneline --graph -10
@ -8,5 +18,3 @@
 [user]
 	name = DarkWiiPlayer
 	email = darkwiiplayer@hotmail.com
-[merge]
-	tool = gvimdiff3