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

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