Create fail-safe commit message during "commit --no-merge" and later commit.message

[bicschneider]

• use temp message for merge --no-commit
• add the message during commit `client.commit("message").

The later operation uses -F <file> rather -m "message" which is safe regarding size