Don't commit merges using method above, instead just type:
And confirm full-blown commit message including merged branch name(s) and resolved conflicts. Bonus: learn about --no-ff flag.
See also: Use git up and save your time
Looks like Git doesn't have ci command, it must be an alias created on your system.
@growtofill Yeah, you're right. I'm too used to it.