You can probably setup smudge and clean filters in Git to do keyword expansion in a CVS-like way.