X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=6616eb74d7c0ff932fce8cfbbee01c33f7c1c527;hb=a1c52fab25615cd9e02bf8595d98e8ec88eb4054;hp=c7383fe3550dba5522157ae3f2139c94f40afa15;hpb=835a73ad2a97584e09bbf8d2a4fad903de28862c;p=dotfiles.git

diff --git a/.gitconfig b/.gitconfig
index c7383fe..6616eb7 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -144,9 +144,12 @@
 	checkin = commit
 	ci = commit
 	cat = cat-file -p
+	dir = rev-parse --git-dir
 	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
@@ -165,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
@@ -177,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
@@ -193,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