1 files changed, 1 insertions, 1 deletions
diff --git a/shellrc b/shellrc
index 7a2ae5f..2979249 100644
--- a/shellrc
+++ b/shellrc
@@ -84,7 +84,7 @@ gitbmerge() {
 			rm -r "$WT"
 			git worktree prune
 		fi
-		git merge "$1" && git push && git branch -d "$1" && git push origin :"$1"
+		git merge --ff-only "$1" && git push && git branch -d "$1" && git push origin :"$1"
 	)
 }