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

Git difftool -y --merge-base B -- compares with B instead of fork point #2360

Open
pavoljuhas opened this issue Dec 5, 2024 · 0 comments
Open

Comments

@pavoljuhas
Copy link
Contributor

I often work on a feature-branch which gets behind a fast-moving main branch.
I would like to see changes in the feature-branch w/r to its fork-point from main.
In a stock git I can do (assuming feature-branch is checked out)

git diff --merge-base main

I tried to accomplish something similar with vim-fugitive using

Git difftool -y --merge-base main

This correctly opened new tabs for files changed in the feature-branch (skipping later changes in main),
however the files were compared to the main rather than to the fork point from main.

Would it be possible to get this fixed?

I see this behavior in the latest fugitive version at 320b18f.

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

No branches or pull requests

1 participant