From: Tony Duckles <tony@nynim.org>
Date: Sun, 3 Dec 2017 20:51:03 +0000 (-0600)
Subject: .gitconfig: Use diff.algorithm = patience
X-Git-Url: http://git.nynim.org/dotfiles.git/commitdiff_plain/e0ed216c903b712b5b6f63800b3074801c08040f

.gitconfig: Use diff.algorithm = patience
---

diff --git a/.gitconfig b/.gitconfig
index 5703c95..ef10054 100644
--- 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,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
@@ -74,5 +76,11 @@
 	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