1

In gitk, the git GUI tool, is there a way to see diff of merge commit. Because it doesn't show me diff of merge commit except the conflicting change which was changed. Or is there anything silly that I'm missing?

IsmailS
  • 10,797
  • 21
  • 82
  • 134
  • 1
    I have never used gitk, and I am sure you have tried, but have you looked for any 'git status' commands? – Matthew Jul 27 '16 at 15:51

2 Answers2

2

Select the first parent commit of the merge. Now right click the merge commit, and Diff selected -> this. You can show the difference between any two commits this way.

stefandtw
  • 468
  • 6
  • 5
0

If you havent merged the other branch yet use squash merge and run the gitgui command this will allow you to see the diff.

git merge --squash <other branch>
git gui
Ayon Nahiyan
  • 2,140
  • 15
  • 23
  • But that would require me to first checkout new branch which starts at one of the parent of the merge commit. – IsmailS Jul 27 '16 at 17:47