@davedelong @GeekAndDad

I do a third way where I have my default identity in my user git config. Then I conditionally import a different config with a different identity when in certain directories. This matches up the email address used with wichever email address is preferred to be tied to a commit.

This works well because I want to have all of my projects in org directories anyway.