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

diff --git a/.gitconfig b/.gitconfig
index 3860cb2..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