work-tree instead of cd for git merge