X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/a31466426f83569233d628c32eee5c84b2e5fabd..54492813815acf4a49b7a5b08bc52372f71fb1fc:/.gitconfig?ds=inline

diff --git a/.gitconfig b/.gitconfig
index 95f87b3..dbaf6f7 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -3,7 +3,7 @@
 	email = madduck@madduck.net
 	signingkey = 330c4a75
 [core]
-	pager = "less -Fr"
+	pager = "less --quit-if-one-screen --raw-control-chars --no-init --hilite-search --SILENT"
 [diff]
 	renames = copies
 [alias]
@@ -22,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]
@@ -29,9 +31,16 @@
 	diff = auto
 	interactive = auto
 	status = auto
-[url "git+ssh://git.debian.org/git/"]
+	ui = auto
+[url "ssh://git.debian.org/git/"]
 	insteadOf = alioth:
-[url "git+ssh://git.madduck.net/srv/git/git.madduck.net/"]
+[url "ssh://git.madduck.net/madduck"]
 	insteadOf = madduck:
 [push]
 	default = matching
+[sendemail]
+	confirm = auto
+[help]
+	autocorrect = 5
+[format]
+	signoff = true