add diff.tool

[etc/git.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index d22b51c3670352a71d5ca8b7cc5b9988fb0be805..3cb2e85d4f49a76bbf234a73f186ae111c9fa21c 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -14,6 +14,7 @@
        ci = commit -a
        stat = status
        files = ls-files -v --deleted --modified --others --directory --no-empty-directory --exclude-standard
        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]
 [clean]
        requireForce = true
 [branch]


@@ -21,6 +22,8 @@
        autosetuprebase = remote
 [merge]
        tool = vimdiff
        autosetuprebase = remote
 [merge]
        tool = vimdiff

+[diff]
+       tool = vimdiff

 [gui]
        fontui = -family rotissansserif -size 10 -weight bold -slant roman -underline 0 -overstrike 0
 [color]
 [gui]
        fontui = -family rotissansserif -size 10 -weight bold -slant roman -underline 0 -overstrike 0
 [color]


@@ -32,3 +35,7 @@
        insteadOf = alioth:
 [url "git+ssh://git.madduck.net/srv/git/git.madduck.net/"]
        insteadOf = madduck:
        insteadOf = alioth:
 [url "git+ssh://git.madduck.net/srv/git/git.madduck.net/"]
        insteadOf = madduck:

+[push]
+       default = matching
+[sendemail]
+       confirm = auto