X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/ec4e367883db1fad2161e2fe5375d5852c9292f3..f3b2adb1d3afd1d591247c3204bb191cf716c8f7:/.gitconfig

diff --git a/.gitconfig b/.gitconfig
index 02efd56..503f01d 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -3,9 +3,9 @@
 	email = madduck@madduck.net
 	signingkey = 330c4a75
 [core]
-	pager = cat
-[gui]
-	fontui = -family rotissansserif -size 10 -weight bold -slant roman -underline 0 -overstrike 0
+	pager = "less --quit-if-one-screen --raw-control-chars --no-init --hilite-search --SILENT"
+[diff]
+	renames = copies
 [alias]
 	restore = checkout HEAD
 	dist = "!git archive --format=tar -v --prefix=$(git describe HEAD)/ $(git describe HEAD) | gzip -9 > ../$(git describe HEAD).tar.gz"
@@ -14,7 +14,37 @@
 	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]
 	autosetupmerge = true
+	autosetuprebase = remote
+[merge]
+	tool = vimdiff
+[diff]
+	tool = vimdiff
+[gui]
+	fontui = -family rotissansserif -size 10 -weight bold -slant roman -underline 0 -overstrike 0
+[color]
+	branch = auto
+	diff = auto
+	interactive = auto
+	status = auto
+	ui = auto
+[url "ssh://git.debian.org/git/"]
+	insteadOf = alioth:
+[url "git://git.madduck.net/madduck/pub/"]
+	insteadOf = madduck-anon:
+[url "ssh://git.madduck.net/madduck/"]
+	insteadOf = madduck:
+[url "ssh://git.madduck.net/madduck/pub/"]
+	pushInsteadOf = git://git.madduck.net/madduck/
+[push]
+	default = matching
+[sendemail]
+	confirm = auto
+[help]
+	autocorrect = 5
+[format]
+	signoff = true