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

diff --git a/.gitconfig b/.gitconfig
index 74673eb..6616eb7 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -95,7 +95,7 @@
 
   ssb = status --short --branch
 
-  aliases = "!git config --get-regexp '^alias\\.' | colrm 1 6 | sed 's/ / = /'"
+  aliases = "!git config --get-regexp '^alias\\.' | cut -c7- | sed 's/ / = /'"
 
   add-alias = "!f() { [ $# = 3 ] && git config $1 alias.\"$2\" \"$3\" && return 0 || echo \"Usage: git add-(local|global)-alias <new alias> <original command>\" >&2 && return 1; }; f"
   add-global-alias = "!exec git add-alias --global"
@@ -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
 
@@ -206,3 +228,17 @@
 [gui]
 	fontui = -family \"DejaVu Sans\" -size 18 -weight normal -slant roman -underline 0 -overstrike 0
 	fontdiff = -family \"DejaVu Sans Mono\" -size 18 -weight normal -slant roman -underline 0 -overstrike 0
+
+# Github URL shortcuts
+[url "git@github.com:"]
+	insteadOf = "gh:"
+	pushInsteadOf = "github:"
+	pushInsteadOf = "git://github.com/"
+[url "git://github.com/"]
+	insteadOf = "github:"
+[url "git@gist.github.com:"]
+	insteadOf = "gst:"
+	pushInsteadOf = "gist:"
+	pushInsteadOf = "git://gist.github.com/"
+[url "git://gist.github.com/"]
+	insteadOf = "gist:"