Git color merge/rebase conflicts

Question

I was wondering if someone had a trick to color the ouput of a merge or rebase when there is a conflict. I want to color specially the line with the filename, for example the second line here :

Auto-merging CMakeLists.txt
CONFLICT (content): Merge conflict in CMakeLists.txt
Failed to merge in the changes.

Thanks

EDIT :

Using git alias and a bash function I can write this :

color-merge = "!f() { git merge --no-commit --stat $1| egrep --color 'CONFLICT .*|$'; }; f"

This will color all the conflict lines but :

• It's impossible to change the options passed to merge
• There is no completion on the branch to be tracked

So I'm looking for something more powerful.

Cheers

Answer 1

Another option might be to create a git alias. This is preferable to me because it keeps keep git-specific customizations together instead of floating elsewhere in an unrelated .profile file somewhere.

Adding something like this to your ~/.gitconfig or the local git project's .git/config should also work:

[alias]
    color-merge = "!f() { git merge $@ | egrep --color 'CONFLICT .*|$' ; }; f"

Invoke it like so: git color-merge branch --option1

Note that your shell's GREP_COLOR environment variable will control the color used.