Re: VC mode and git

[Steinar Bang]

>>>>> Steinar Bang <address@hidden>:

> Or:
>  git commit
>  git pull --rebase
>  git push
> (forgive me, Eli, I said the "r" word...)

So, avoiding rebase, this works as well:
 git commit
 git pull
 git push

There will be an extra commit in the history (from the pull's merge),
but this will always be safe, nothing's lost, and any merge will be in a
separate commit.