1 files changed, 2 insertions, 1 deletions
diff --git a/.gitconfig b/.gitconfig
index 8eebcf8..206f95e 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -16,8 +16,9 @@
 	b = branch -vv
 	sup = log --all --pretty=format:'%Cblue%h%C(yellow)%d %Creset%s %Cgreen(%cr) %Cred%an%+b'
 	sp = show --stat -p
-	mff = merge
+	mff = merge --ff-only
 	refl = reflog --date=relative
+	mnf = merge --no-ff
 [merge]
 	tool = vimdiff
 	conflictstyle = diff3