git: auto setup merge