Merge branch 'jc/rebase-i-commit-msg-fix'

* jc/rebase-i-commit-msg-fix: rebase-i: do not get fooled by a log message ending with backslash rebase-i: style fix