X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=6616eb74d7c0ff932fce8cfbbee01c33f7c1c527;hb=4d5e1569726fbe052be1755a451e652f88df4c69;hp=0581c556b3b00165fe4ccc8f6f969e2a3c94f4c1;hpb=cd3d109b75ec5bfbe0bcf0f606159b0049611b10;p=dotfiles.git

diff --git a/.gitconfig b/.gitconfig
index 0581c55..6616eb7 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,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
@@ -194,10 +204,21 @@
 
 [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