1 files changed, 5 insertions, 0 deletions
diff --git a/git-checkout.sh b/git-checkout.sh
index 119bca1ffb..eb28b291b6 100755
--- a/git-checkout.sh
+++ b/git-checkout.sh
@@ -77,6 +77,11 @@ while [ "$#" != "0" ]; do
     esac
 done
 
+case "$force$merge" in
+11)
+	die "git checkout: -f and -m are incompatible"
+esac
+
 # The behaviour of the command with and without explicit path
 # parameters is quite different.
 #