X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fdiv0-gittools.git;a=blobdiff_plain;f=git-branch-manager;h=82720c987288ce649b4c76d2580d71c8dd998f82;hp=447c81a136abd23b1df6513e33e945d276b662eb;hb=cb82cb3db790713e8d0e769ba1ced31e480ec4ab;hpb=6cd6cc1c8339e0f4e5439d30166fa2df2776987c

diff --git a/git-branch-manager b/git-branch-manager
index 447c81a..82720c9 100755
--- a/git-branch-manager
+++ b/git-branch-manager
@@ -244,9 +244,9 @@ sub merge_commit($)
 	}
 	if($do_commit)
 	{
-		run 'git', 'commit', '-F', '.commitmsg'
+		run 'git', 'commit', '--allow-empty', '-F', '.commitmsg'
 			or (run 'git', 'mergetool'
-				and run 'git', 'commit', '-F', '.commitmsg')
+				and run 'git', 'commit', '--allow-empty', '-F', '.commitmsg')
 					or die "git-commit: $!";
 	}
 }
@@ -297,9 +297,9 @@ sub unmerge_commit($)
 	}
 	if($do_commit)
 	{
-		run 'git', 'commit', '-F', '.commitmsg'
+		run 'git', 'commit', '--allow-empty', '-F', '.commitmsg'
 			or (run 'git', 'mergetool'
-				and run 'git', 'commit', '-F', '.commitmsg')
+				and run 'git', 'commit', '--allow-empty', '-F', '.commitmsg')
 					or die "git-commit: $!";
 	}
 }