In magit, how do I see a diff what a branch adds to my current branch?

Question

In the Magit Refs buffer, you can press tab on a branch (the branch I want to merge in) to see what commits would be added if this branch were merged into the currently checked out branch, and you can press enter on the commits to see their changes. Is there a way to see all those changes unified together?

I don't think the magit diff dwim feature is what I want, because it shows all the changes that are on the current branch but not on the branch I want to merge in. I usually don't care about seeing those changes, because I am mostly interested in what the branch I am merging will change, not everything else that changed.

Duplicate of http://emacs.stackexchange.com/questions/27545/magit-git-diff-between-two-specific-shas ? — phils, Oct 05 '16 at 00:23

score 17 · Accepted Answer · answered Oct 06 '16 at 18:15

17

You can see what a branch will add when merged by using merge preview m p. This can be used from the Magit Refs buffer by navigating point to the branch you want to preview a merge of and typing m p.

answered Oct 06 '16 at 18:15

ryantm

8,217
6
45
57

If you want to see list of commits do actual merge *m m* and then revert it. – artscan Dec 26 '19 at 18:23
3

`m p` showes me `(empty)`. I do prefer using `m n` which creates all the changes, but does not commit them. – mpm Mar 03 '20 at 10:36
If it works for `m n` it should work for `m p`. But `m n` is a nice alternative. – young_souvlaki Apr 04 '21 at 00:47
1

@mpm you probably need to specify `origin/` as opposed to just `` when prompted. – young_souvlaki Apr 06 '21 at 15:22

score 10 · Answer 2 · answered Oct 05 '16 at 09:49

Yes, "diff dwim" doesn't really do what I mean here either. That should be improved, open a feature request please.

Meanwhile you can use d r and then type the range (at least with completion). Or you could use d d and then flip the revisions (D f) as well as switch the range style (D r). Together this changes feature..master to master...feature.

In magit, how do I see a diff what a branch adds to my current branch?

2 Answers2