From f7bbac700377968afce8fd86c8c9db294cfaaca2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Tue, 19 Sep 2017 13:33:41 +0200 Subject: Only allow ff in gitbmerge --- shellrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'shellrc') 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" ) } -- cgit v1.2.3