.bashrc: Misc cleanup

[dotfiles.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 5703c95b7df57ed0729a8247e2633ff1e1152797..3a5ef17f79e38e5bc3eb879a1157631847b598ae 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -20,10 +20,10 @@
        bv           = !git branch --color -vv
        cv           = !git-cherry-view
        # Diff helpers
-       df           = diff --patience
-       dfc          = diff --patience --cached
-       dfw          = diff --patience --word-diff=color
-       dfcw         = diff --patience --cached --word-diff=color
+       df           = diff
+       dfc          = diff --cached
+       dfw          = diff --word-diff=color
+       dfcw         = diff --cached --word-diff=color
        # Searching
        ls           = ls-files
        ack          = !git-ack
@@ -34,15 +34,21 @@
        root         = rev-parse --show-toplevel
        who          = shortlog -s --
        fp           = format-patch --stdout
+       patch        = !git --no-pager diff --no-color
 
 [core]
        filemode = true
        logallrefupdates = true
        whitespace = space-before-tab, trailing-space
        excludesfile = ~/.gitignore_global
+       pager = diff-pager
+
+[interactive]
+       diffFilter = diff-filter
 
 [diff]
        renames = copies
+       algorithm  = patience
 
 [sendemail]
        smtpserver = smtp.gmail.com
@@ -74,5 +80,11 @@
        changed = green bold
        untracked = blue bold
 
+[color "diff-highlight"]
+       oldNormal = nobold
+       oldHighlight = red bold
+       newNormal = nobold
+       newHighlight = green bold
+
 [push]
        default = matching