unify git code for going master