git blame annotate is showing merge commits; default blame ignores
Answered
"Annotate with Git Blame" is showing merge commits, while running `git blame` from cli shows the actual _change_, as expected.
Example git history:
$ git log --one-line my-file.txt
bb222222 unrelated merge commit
aa111111 the actual change
git blame shows the change, and ignores merge commit:
$ git blame my-file.txt
aa1111111 <change author> hello world
HOWEVER, when I'm viewing the Intellij "Annotate with Git Blame", I'm seeing the `bb222222 unrelated merge commit`.
----
I rely on this feature quite heavily, and it works as expected with other editors I use. Does anyone know a workaround, such as a `git config blame.xyz`?
---
Annotate docs:
https://www.jetbrains.com/help/idea/investigate-changes.html#annotate_blame
Possibly related issue:
Please sign in to leave a comment.
Hello Davidjwolgemuth
IDE relies on command-line git and it shows what Git outputs to IDE.
Would it be possible to find that merge commit and make sure that a file is indeed not affected by merge commit?
Also, would it be possible to share a sample project where such behavior is reproducible? Regrettably, I cannot reproduce this behavior on my side.