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

diff --git a/.gitconfig b/.gitconfig
index c7383fe..7d669a7 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
@@ -193,6 +197,7 @@
 
 [push]
 	default = simple
+	followTags = true
 
 [receive]
 	denyNonFastForwards = true