.gitconfig: Use diff.algorithm = patience
authorTony Duckles <tony@nynim.org>
Sun, 3 Dec 2017 20:51:03 +0000
committerTony Duckles <tony@nynim.org>
Sun, 3 Dec 2017 20:51:03 +0000
.gitconfig

index 5703c95b7df57ed0729a8247e2633ff1e1152797..ef100549b640a05e9cb539276247e662ff03c365 100644 (file)
        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,6 +34,7 @@
        root         = rev-parse --show-toplevel
        who          = shortlog -s --
        fp           = format-patch --stdout
+       patch        = !git --no-pager diff --no-color
 
 [core]
        filemode = true
@@ -43,6 +44,7 @@
 
 [diff]
        renames = copies
+       algorithm  = patience
 
 [sendemail]
        smtpserver = smtp.gmail.com
        changed = green bold
        untracked = blue bold
 
+[color "diff-highlight"]
+       oldNormal = red bold
+       oldHighlight = red bold 52
+       newNormal = green bold
+       newHighlight = green bold 22
+
 [push]
        default = matching