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.

Sign up for GitHub

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

Jump to bottom

View alternate parent changes at merge commits #384

Open
SimonAlfie opened this issue Sep 18, 2020 · 2 comments · May be fixed by #488
Open

View alternate parent changes at merge commits #384

SimonAlfie opened this issue Sep 18, 2020 · 2 comments · May be fixed by #488
Assignees
@dan1994
Labels
feature request Feature request nice to have A feature request that is nice to have (lower priority)
Projects
Git Graph
Milestone
v1.31.0

Comments

@SimonAlfie
Copy link

Currently at a merge point the in graph, you only see the modified file list for the commit when compared with one of the parents. Some other git GUIs automatically show the changes between both parents (e.g. GitExtensions) or make it easy to show them (e.g. gitg)

It would be very useful if Git Graph supported this too. An example from GitExtensions is in this image:

GitExtensionsMergeDiff

The current workaround is to use Ctrl-Click to select the alternate parent, but that can require scrolling a long way down the tree if the commit being merged is far back in history.
@SimonAlfie SimonAlfie added the feature request Feature request label Sep 18, 2020
@mhutchie
Copy link
Owner

Hi @SimonAlfie,

This would definitely be a useful a feature to have in the Commit Detail View! I’ll look into the best way to achieve it, and then schedule it for an upcoming release.

@mhutchie mhutchie added the nice to have A feature request that is nice to have (lower priority) label Sep 18, 2020
@mhutchie mhutchie added this to To Do in Git Graph via automation Dec 23, 2020
@dan1994
Copy link
Contributor

dan1994 commented Mar 20, 2021

@mhutchie Please assign to me

@mhutchie mhutchie assigned dan1994 and unassigned mhutchie Mar 20, 2021
@mhutchie mhutchie moved this from To Do to In Progress in Git Graph Mar 20, 2021
@dan1994 dan1994 linked a pull request Mar 20, 2021 that will close this issue
Open
dan1994 added a commit to dan1994/vscode-git-graph that referenced this issue Apr 21, 2021
@dan1994
View alternate parent changes at merge commits
15f475d 
Fixes mhutchie#384
@mhutchie mhutchie added this to the v1.31.0 milestone May 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@dan1994 dan1994

Labels
feature request Feature request nice to have A feature request that is nice to have (lower priority)
Projects
Git Graph
In Progress
Milestone
v1.31.0
Development

Successfully merging a pull request may close this issue.

#384 View alternate parent changes at merge commits dan1994/vscode-git-graph
3 participants
@SimonAlfie @mhutchie @dan1994