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

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