Has anyone been able to run a diff (or mergetool) between a working tree file and the same file in a separate branch? I’ve reviewed the docs which seems to indicate I can do this:
git diff [options] <commit> <commit> [--] [<path>...]
A ‘commit’ in this case, seems to allow a branch name (at least that’s what I get from
man gitrevisions but it’s a bit confusing. I’ve googled and found all kinds of suggestions, but none of them work for me:
git diff <branch> -- <file> git diff <branch>:<file> <file> git diff <branch>:<file> -- <file>
At this point, I’m just flailing around and hoping someone has the solution!