From: Junio C Hamano Date: Wed, 15 Nov 2006 19:06:38 GMT Subject: [PATCH] git-checkout: do not allow -f and -m at the same time. Message-ID: <7vfyckmsw1.fsf@assigned-by-dhcp.cox.net> Instead of silently ignoring one over the other, complain on this incompatible combination. Signed-off-by: Junio C Hamano --- * Back to fixing usability issues one at a time instead of throwing everything away with bathwater. git-checkout.sh | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/git-checkout.sh b/git-checkout.sh index 119bca1..eb28b29 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. # -- 1.4.4