Show merge commits in file history

[MarekLew]

I don`t find merged commit in history view.

• GitLens Version: 7.1.0
• VSCode Version: Code 1.19.1 (0759f77bb8d86658bc935a10a64f6182c5a1eeba, 2017-12-19T09:41:01.414Z)
• OS Version: Linux x64 4.10.0-42-generic

Steps to Reproduce:

1. Create repository
2. Add file, commit
3. create branch1
4. edit file, commit
5. go to master
6. create branch2
7. edit file,commit
8. merget branch1 to branch2
9. click show in history view in pane

At this moment I change in file git.{js|ts} in function log_file lines

- if (options.skipMerges || !options.ref || options.maxCount! > 2) {
+ if (options.skipMerges || options.maxCount! < 2) {

and it`s work fine for me.

but I dont understand this logic when added params.push(--no-merges);togit` parameters.

[eamodio]

If you take this same repo and look at the history on GitHub does it show the merge commit?

[MarekLew]

Why GitHub? It`s local git repo. What do you want to say?
I do not see all commit (merge commit) in current branch (or in other branch to).

[MarekLew]

marek@marek-XXX:~/xxxx$ git branch
  branch1
* branch2
  master
marek@marek-XXX:~/xxxx$ git log
commit 423bcd7a6ea3b97f8455c5ac49e98886caf2111a
Merge: f479a3b 3a61bea
Author: Marek Lewandowski <marek@testmail.com>
Date:   Mon Jan 1 17:31:42 2018 +0100

    change 3

commit f479a3b8e307c5dadeeee72fafcb31eaf58cc074
Author: Marek Lewandowski <marek@testmail.com>
Date:   Mon Jan 1 17:27:43 2018 +0100

    change 2

commit 3a61bea9fdee71ed856d8dc4b2ac4eb5d69d524a
Author: Marek Lewandowski <marek@testmail.com>
Date:   Mon Jan 1 17:26:32 2018 +0100

    change 1

commit f25cc2773b4414aa13a277c549366a156b67d062
Author: Marek Lewandowski <marek@testmail.com>
Date:   Mon Jan 1 17:25:14 2018 +0100

    change 0
marek@marek-XXX:~/xxxx$

when I use orginal extension:

after correct code in extension I see:

show change in commits:

And file adnotation:

[eamodio]

This is by design. For file histories I show a simplified version (which leaves out merge commits). Most of the Git tools I've used do the same as well as GitHub (see https://help.github.com/articles/differences-between-commit-views/).

Are you seeing a difference between the file history that GitLens shows vs another tool?

[MarekLew]

No it's not this ( https://help.github.com/articles/differences-between-commit-views/). Ignoring commits from another branch it`s not problem.

Github don't show merge commit in selecting file History list? I didn't see that. Where is that?

In the above example gitlens don't show change 3 (merge commit)(it`s in branch2) for single file in EXLORER view wher branch2 is active.

I would rather see it:

[eamodio]

Thanks -- I've dug into this a bit more, and see that GitHub does indeed show some merge commits in the file history, but GitKraken doesn't. In the next release, I will stop excluding merges and will instead have git simplify them (via --simplify-merges) and I believe this will be the behavior you desire.

Thanks for being persistent on this ;)