> tl;dr: more local branches means less need for arcane git > options. > > --Ed AFAIR you can resist the temptation to have a local master branch at all and just run "git pull --rebase upstream/master" where upstream is configured to be original D repo.