2

When I open the commit view for a regular commit in magit, I can see the diff for each file. When I open a merge commit, I can only see a summary of the number of lines that were changed. Is there a way to get the first behavior for merge commits?

0

1 Answer 1

3

When viewing a merge commit or while hovering it in the log, press d r <RET> to open a diff view showing all the changes.

2
  • I have not yet accepted this answer because I am hoping that someone knows of a better way, preferably a configuration that changes the default behavior. Sep 3, 2019 at 11:01
  • 1
    The reason you don't see any changes is that magit calls git show with --cc. See man git-diff-tree for a description of how these flags compress the patch output. Your solution diffs against the first parent and is the simplest way of seeing what changes were brought in by the merge. You may also want to modify the range to diff against the second parent.
    – Kyle Meyer
    Sep 3, 2019 at 22:49

Your Answer

By clicking “Post Your Answer”, you agree to our terms of service and acknowledge you have read our privacy policy.

Not the answer you're looking for? Browse other questions tagged or ask your own question.