Committing while merging doesn't offer to use default message

[mczepiel]

Aside from not indicating you're in the middle of a merge (which should probably be a separate issue), there default merge commit message is not available:

Merge remote-tracking branch 'remote/awesome-branch'

It might be nice to have a way to expose the commit message from .git/MERGE_MSG

[rowanj]

I'm pretty sure GitX won't actually make the merge commit properly either (I believe it gives an error if you try); but it should at least use the automatic message properly as well.

[peterjwest]

Why can't GitX perform merge commits? How difficult is this to fix?

[rowanj]

I'm not sure, I think it was disabled by the original author before I started my fork.

[peterjwest]

I've had a look at the code and tried disabling the warning. Gitx doesn't know how to make a commit with two parents, it looks like it would be quite involved to change.

[Uncommon]

I think the way GitX does commits is it uses more low-level calls than git commit, and the way that's written doesn't allow for multiple parents. I'm not sure why it's done that way. Maybe because of how amend is done.