Improve git_commit summary output to include diff and merge info