git commit with conflicts message in log

Question

I had some commits in one branch A and did all the development there. Then there was a need to switch to another branch B. It was the same branch as mine but it did not have one - last commit that was in branch A. So I decided to perform cherry-pick for that commit from branch A.

I had some conflicts and I resolved it. However in my log I have

Author: 
Date:  

    Commit message from branch A

    Conflicts:
        file.txt

How to get rid of this information about conflicts? Or is it possible at all?

possible duplicate of [Edit an incorrect commit message in Git](http://stackoverflow.com/questions/179123/edit-an-incorrect-commit-message-in-git) — Joe, Jan 28 '15 at 12:40
But message is correct - but I don't need `conflicts` information there — lapots, Jan 28 '15 at 12:40

score 1 · Accepted Answer · answered Jan 28 '15 at 12:39

1

You should be able to change the commit message using

git commit --amend

answered Jan 28 '15 at 12:39

Guy Bouallet

2,099
11
16

Erm...So `conflicts` information is a part of the message? – lapots Jan 28 '15 at 12:39
I guess so. You just need to try it. – Guy Bouallet Jan 28 '15 at 12:41

score 0 · Answer 2 · answered Jan 28 '15 at 12:41

0

That is just the commit message. The commit message can be changed before you commit.

If you have already committed but have not pushed, you can use:

git commit --amend -m "New commit message"

answered Jan 28 '15 at 12:41

Mark

6,108
3
34
49

git commit with conflicts message in log

2 Answers2