diff --git a/git-mergetool.sh b/git-mergetool.sh
index 94187c306cc..d4078a6affd 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -296,6 +296,7 @@ do
 	    esac
 	    ;;
 	--)
+	    shift
 	    break
 	    ;;
 	-*)