X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/5a2284037037425ef0f62a090902f7797b32400c..70da654e64db467689edf42a19b3b660aa6287ca:/.gitconfig?ds=inline

diff --git a/.gitconfig b/.gitconfig
index 5c7756c..345a078 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"
@@ -18,3 +18,13 @@
 	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