Document a git strategy for working with upstream