X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=23674acce639cbf67b5cdce60bab147704393387;hb=3cc0b540f6b91eb447156653a5c6d5924278b037;hp=3860cb2642e7a43b2d54f5fbce970849c50610c0;hpb=e092cba894b13330558549463d21a1efbe112d32;p=dotfiles.git

diff --git a/.gitconfig b/.gitconfig
index 3860cb2..23674ac 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,9 @@
 [color]
 	ui = auto
 
+[diff]
+	indentHeuristic = true
+
 [include]
 	path = ~/lib/config/git/light_bg