X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/5a2284037037425ef0f62a090902f7797b32400c..95185ca59af3f112b2a6245bae9f4c3526276370:/.gitconfig

diff --git a/.gitconfig b/.gitconfig
index 5c7756c..a3bf34d 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -3,9 +3,9 @@
 	email = madduck@madduck.net
 	signingkey = 330c4a75
 [core]
-	pager = "less -F"
-[gui]
-	fontui = -family rotissansserif -size 10 -weight bold -slant roman -underline 0 -overstrike 0
+	pager = "less -Fr"
+[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,31 @@
 	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 "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