git differencing

i can never remember these, and unfortunately i don't use git often enough to adequately drill it into my head.

To get a name and status difference of what changed between two branches, use this:

git diff --name-status master..branch

To compare two files from different branches, use this:

git difftool branch1:file branch2:file