X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/a8b58654f90e8fc3fa73fe4cd7240c5b03874947..a31466426f83569233d628c32eee5c84b2e5fabd:/.gitconfig?ds=sidebyside

diff --git a/.gitconfig b/.gitconfig
index 56ae58f..95f87b3 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 -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,24 @@
 	ci = commit -a
 	stat = status
 	files = ls-files -v --deleted --modified --others --directory --no-empty-directory --exclude-standard
-	returnto = "!git add . && git commit -m'stowing away trash' >/dev/null && d=$(date +%Y.%m.%d.%H.%M.%S) && git tag trash/$d && echo tagged unwanted worktree $(git rev-parse --short HEAD) with trash/$d && git reset --hard HEAD^ >/dev/null && git reset --hard"
+	sum = log --pretty=format:\"%h %Cblue%ci%Creset %Cgreen%cn%Creset %s\"
 [clean]
 	requireForce = true
-
+[branch]
+	autosetupmerge = true
+	autosetuprebase = remote
+[merge]
+	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
+[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