How to get a git subtree diff?

Question

I have a repository that has mounted another repository with

git subtree add -P some/path  otherremote otherbranch

development has gone on with some local changes, but also with a few rounds of merges done with:

git fetch otherremote
git subtree merge -P some/path otherremote/otherbranch
git commit

Now I want to get a diff between the HEAD of otherremote/otherbranch and the tree at some/path. How can I do this?

Answer 1

This should be what you're looking for:

git diff otherremote/otherbranch commit:some/path

You can even compare against previous revisions, using all the standard commit naming conventions.

For example, I've made a remote repo u-boot, master branch, a subtree of my main repo at u-boot/. To see the changes I've made in my local master branch since a specific version in the remote repo:

git diff u-boot/master~17 master:u-boot/

Tested using git 1.9.0, though I'm pretty sure this generally works with older versions as well.