add diff.tool

[etc/git.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 5c7756c596f4407920914984b76538e9400ced40..3cb2e85d4f49a76bbf234a73f186ae111c9fa21c 100644 (file)
--- 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,28 @@
        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
+[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