X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=7bb34b9f4719169e8b1d957864ce94586d479448;hb=3877f7b9e823abb214f00ef5bff4c2cffdc5b11f;hp=0581c556b3b00165fe4ccc8f6f969e2a3c94f4c1;hpb=cd3d109b75ec5bfbe0bcf0f606159b0049611b10;p=dotfiles.git

diff --git a/.gitconfig b/.gitconfig
index 0581c55..7bb34b9 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -148,6 +148,8 @@
 	dump = cat-file -p
 	file = cat-file -t
 	type = cat-file -t
+	ff = merge --ff-only
+	git = !git
 	l1 = log --decorate --oneline
 	l5 = log --decorate -5
 	ld = log --decorate
@@ -166,6 +168,7 @@
 	remotes = remote --verbose
 	#root = !exec pwd
 	root = rev-parse --show-toplevel
+	status = status --no-short
 	st = status --short
 	stb = status --short --branch
 	sd = show --decorate
@@ -178,6 +181,12 @@
 [color]
 	ui = auto
 
+[diff]
+	indentHeuristic = true
+
+[grep]
+	fallbackToNoIndex = true
+
 [include]
 	path = ~/lib/config/git/light_bg
 
@@ -194,6 +203,7 @@
 
 [push]
 	default = simple
+	followTags = true
 
 [receive]
 	denyNonFastForwards = true