Disable session.el in git-commit-mode, to avoid spurious point placement
Merge remote-tracking branch 'origin/master'