diff --git a/gitconfig b/gitconfig
index 8480ec6..fbf339c 100644
--- a/gitconfig
+++ b/gitconfig
@@ -17,3 +17,4 @@
 [alias]
 	pushf = push --force-with-lease
 	lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
+    ff = merge --ff-only