X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=11205f98f4a9904a7d320b94fee8d2523cbeeff7;hb=92ac70ec51e51054b5af0250be30986b907e79b9;hp=901e37c45d2de04d438bec848d69ae22b129390f;hpb=4f28abc922643cea4d8aee6804067d688abcd600;p=dotfiles.git

diff --git a/.gitconfig b/.gitconfig
index 901e37c..11205f9 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -144,12 +144,13 @@
 	checkin = commit
 	ci = commit
 	cat = cat-file -p
+	dh = "!f() { git -c color.diff=always diff \"$@\" | perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less; }; f"
 	dir = rev-parse --git-dir
 	dump = cat-file -p
 	file = cat-file -t
 	type = cat-file -t
 	ff = merge --ff-only
-	git = !git
+	git = !exec git
 	l1 = log --decorate --oneline
 	l5 = log --decorate -5
 	ld = log --decorate
@@ -211,7 +212,7 @@
 	#denyCurrentBranch = updateInstead
 	denyDeleteCurrent = true
 	#denyDeletes = true
-	denyNonFastForwards = true
+	#denyNonFastForwards = true
 
 #[tag]
 #	sort = version:refname