X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/d5084fba6f84e73e7d995f95ee317bd70357e2b4..95185ca59af3f112b2a6245bae9f4c3526276370:/.gitconfig?ds=sidebyside

diff --git a/.gitconfig b/.gitconfig
index d22b51c..a3bf34d 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -14,6 +14,7 @@
 	ci = commit -a
 	stat = status
 	files = ls-files -v --deleted --modified --others --directory --no-empty-directory --exclude-standard
+	sum = log --pretty=format:\"%h %Cblue%ci%Creset %Cgreen%cn%Creset %s\"
 [clean]
 	requireForce = true
 [branch]
@@ -21,6 +22,8 @@
 	autosetuprebase = remote
 [merge]
 	tool = vimdiff
+[diff]
+	tool = vimdiff
 [gui]
 	fontui = -family rotissansserif -size 10 -weight bold -slant roman -underline 0 -overstrike 0
 [color]
@@ -28,7 +31,14 @@
 	diff = auto
 	interactive = auto
 	status = auto
+	ui = auto
 [url "git+ssh://git.debian.org/git/"]
 	insteadOf = alioth:
 [url "git+ssh://git.madduck.net/srv/git/git.madduck.net/"]
 	insteadOf = madduck:
+[push]
+	default = matching
+[sendemail]
+	confirm = auto
+[help]
+	autocorrect = 5