From: martin f. krafft <madduck@madduck.net>
Date: Tue, 30 Sep 2008 13:14:19 +0000 (+0200)
Subject: update git config
X-Git-Url: https://git.madduck.net/etc/git.git/commitdiff_plain/78b9f092063fe67589c03872558cd0049a06e181

update git config
---

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