Tools to keep a git integration branch up to date