git p4 submit bugs (submit fails due to keyword expansion mismatch and gives bad instructions for how to proceed)

I've been experimenting with git-p4 as a front-end to Perforce as described in http://www.perforce.com/blog/120113/git-perforce-client, but two bugs are causing me major headaches:

(1) git-p4 doesn't work with P4 keyword expansion. (I gather there's a fork of git-p4 that makes it work, but the current official distro doesn't.) This can lead to some ugly failed submits down the road. Which leads me to ...

(2) When a git p4 submit fails, the error message for how to resolve it is bogus. The instructions say "Please resolve and submit the conflict manually and continue afterwards with git-p4 submit --continue", but when I do that, I get:

$ git p4 submit --continue
Usage: git-p4 submit [options] [name of git branch to submit into
perforce depot]
git-p4: error: no such option: --continue

Ugh.

(P.S. If there's a better place to post bug reports, etc., please inform. Thanks.)

-Eric