On 18/08/2022 18.46, Mick Semb Wever wrote:
Until IDEs auto cross-reference JIRA,
I'm going to lightly touch the lid of Pandora's Box here and walk
away slowly. It drives me *nuts* when I'm git blaming a file to
understand the context of why a change was made (to make sure I
continue to respect it!) and I see "merge 3.11 into trunk" or some
other such useless commit message, then have to dig into the git
integration and history, then figure out which merge commits were
real and which were -s ours and silently changed, etc.
So about those merge commits... ;)
The beef I have with this is it's just not that difficult: just look
at the parent 2 commit of the merge.
```
|git log -n1 <merge-commit>^2|
```
(you can also use `git log --follow .` if you like history without
merge commits)
There's `git merge --log` which provides a short-form log in the merge
commit.
