X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=8c2f04054602eeaf5879f5b76feb30e0198a8537;hb=43f1c1115d4bf42ce69852a9514dc351264524fd;hp=901e37c45d2de04d438bec848d69ae22b129390f;hpb=4f28abc922643cea4d8aee6804067d688abcd600;p=dotfiles.git

diff --git a/.gitconfig b/.gitconfig
index 901e37c..8c2f040 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -136,6 +136,8 @@
   unassume-all = "!git assumed | xargs git update-index --no-assume-unchanged"
   assumed  = !"git ls-files -v | grep ^h | cut -c 3-"
 
+  stashes = stash list
+
 	branches = branch --all
 	ca = commit --all
 	cv = commit --verbose
@@ -144,12 +146,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 +214,7 @@
 	#denyCurrentBranch = updateInstead
 	denyDeleteCurrent = true
 	#denyDeletes = true
-	denyNonFastForwards = true
+	#denyNonFastForwards = true
 
 #[tag]
 #	sort = version:refname