git refuses to work with gvim

Hi, a few days ago I decided to switch from vim to gvim. To make use of this in most cases I added :gui to my .vimrc which should make most applications automatically switch to use gvim if they used the vim command before.

But git seems to have problems with this. If I do now a "git commit something" not the gui is opened but the console-version of vim. I could live with that for git but if I now type some commit-message in the console-version and do :x or :wq I get an error-message:

# git commit something fatal: no commit message? aborting commit. #

Also

# EDITOR=gvim git commit something fatal: no commit message? aborting commit. #

shows the same error.

Removing :gui from my .vimrc makes git behave normally again. I don't know what the problem here is: vim or git or both toghether?

I already saw screenshots of people using git with gvim. So there is a way to make them work together but what am I missing?

OS: Debian Lenny
vim: 7.1
git: 1.5.6.5

greetings