Avoid interactive commit message when doing git merge