update-git-repo - make merge --ff-only