Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include merge commits in the file history #2044

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

emanuel-v-r
Copy link

@emanuel-v-r emanuel-v-r commented Jun 19, 2023

Currently when we use file history, it doesn't show any merge commits, which could be misleading, as it might contain changes for this specific file.
Also, the popular git providers show merge commits when showing the history of a single file.
Looks like the changes in this PR could fix it (currenlty it simply skips when there is more than one parent).
Eventually if we want to keep the old behavior, we may want to pass some kind of flag to the FileHistory class, maybe includeMergeCommits=false

@emanuel-v-r emanuel-v-r closed this Jan 5, 2024
@emanuel-v-r emanuel-v-r reopened this Jan 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant