Timeline for Use magit to display the difference between two branches
Current License: CC BY-SA 4.0
12 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Mar 19, 2020 at 16:21 | answer | added | Fernando Jascovich | timeline score: 18 | |
| Apr 15, 2019 at 16:05 | comment | added | Guildenstern | You might also be interested in git-range-diff: “Compare two commit ranges (e.g. two versions of a branch)”. (Requires a relatively recent version of git(1).) | |
| Mar 22, 2019 at 9:58 | comment | added | scott | Do you have GIT_EXTERNAL_DIFF set to kdiff? Or maybe in git config diff.external? Or it could be coming from .gitattributes. Maybe try git diff --no-ext-diff. | |
| Mar 20, 2019 at 0:11 | answer | added | tarsius | timeline score: 3 | |
| Mar 2, 2019 at 17:41 | comment | added | Matt Ellen♦ | Git diff doesn't work for me as it can't find kdiff. | |
| Mar 2, 2019 at 14:16 | comment | added | InHarmsWay | Does using git diff on the command line show differences? | |
| Feb 28, 2019 at 22:11 | history | edited | Matt Ellen♦ | CC BY-SA 4.0 | added 346 characters in body |
| Feb 28, 2019 at 22:01 | comment | added | Matt Ellen♦ | I would be worried if there were no differences as they are very different branches (for example, completely different login methods). I will try a different diff method on a single file from the revisions to see what's up. | |
| Feb 28, 2019 at 21:36 | comment | added | phils | I would assume that there are indeed no differences between the two refs that you gave it. Unless you have the "limit to files" filter enabled? Do you get a different response from the command line? | |
| Feb 28, 2019 at 21:34 | comment | added | Matt Ellen♦ | I've described as best I can. I put in the two refs and the window comes up saying empty. I'll add a screenshot in a bit. | |
| Feb 28, 2019 at 21:29 | comment | added | phils | The linked answer is exactly the solution you want. Just use the two commit refs in question as START and END (or you can use the branch names, if you want to compare the heads of two branches). You'll need to describe the problem in more detail if that isn't working. (You can do this on the command line as well with git diff START..END but that's no different to doing it in Magit.) | |
| Feb 28, 2019 at 19:37 | history | asked | Matt Ellen♦ | CC BY-SA 4.0 |