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

diff --git a/.gitconfig b/.gitconfig
index 02efd56..5ba6ea4 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"
@@ -18,3 +18,8 @@
 	requireForce = true
 [branch]
 	autosetupmerge = true
+	autosetuprebase = remote
+[merge]
+	tool = vimdiff
+[gui]
+	fontui = -family rotissansserif -size 10 -weight bold -slant roman -underline 0 -overstrike 0