@matheusbsbs / matheus-bagliano / commits / 897643cc79
Fork 0

git-checkout: do not allow -f and -m at the same time.

Instead of silently ignoring one over the other, complain on this incompatible combination. Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Nov 15, 2006 at 10:46 UTC 897643cc79cb8c05694c98a4fb0560c78952db3e
1 file changed +5
git-checkout.sh
+5
@@ -77,6 +77,11 @@ while [ "$#" != "0" ]; do
77 esac
78 done
79
80 +case "$force$merge" in
81 +11)
82 + die "git checkout: -f and -m are incompatible"
83 +esac
84 +
85 # The behaviour of the command with and without explicit path
86 # parameters is quite different.
87 #