FWIW, if you're using git for other projects and need to have a different identity there, it's also possible to configure name and email on a per-checkout basis.

In each of your dw-free and dw-nonfree checkouts, give these commands:

git config user.name "your name"
git config user.email "your@email"

or edit the .git/config file in each checkout and add the section

[user]
        name = your name
        email = your@email

And then git will use those values for that checkout, overriding the global ones in $HOME/.gitconfig.