X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=6616eb74d7c0ff932fce8cfbbee01c33f7c1c527;hb=5500a2dadeaa9252a0285627a00b90847a2cb796;hp=f5605cf6e2a23511df7f38b87b24a51fb3a154f9;hpb=761f73a4e79bbf4e28d975a8aa623d3d250bbe58;p=dotfiles.git

diff --git a/.gitconfig b/.gitconfig
index f5605cf..6616eb7 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -168,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
@@ -180,11 +181,18 @@
 [color]
 	ui = auto
 
+[diff]
+	indentHeuristic = true
+
+[grep]
+	fallbackToNoIndex = true
+
 [include]
 	path = ~/lib/config/git/light_bg
 
 [log]
 	abbrevCommit = true
+	#mailmap = true
 
 [merge]
 	tool = vimdiff
@@ -197,10 +205,20 @@
 [push]
 	default = simple
 	followTags = true
+	recurseSubmodules = check
 
 [receive]
+	#denyCurrentBranch = updateInstead
+	denyDeleteCurrent = true
+	#denyDeletes = true
 	denyNonFastForwards = true
 
+#[transfer]
+#	fsckObjects = true
+
+[user]
+	signingKey = 6E080B70B6287B03
+
 [web]
 	browser = webbrowser