git diff --patience -C -C branch@{upstream} <1> <2>The --wordwise option also allows git-diff to do word-by-word comparison
in a semi-intelligent way. However, sometimes it can produce surprising results,
so it is disabled by default.
Since any additional options are passed through to git-diff unchanged, you can
+use this as a general replacement for git diff for things like:
+
+
$ # See what changed in a file on the current branch
+$ git upstream-diff some/file.py
+...
+
+$ # Omit deleted files from the diff
+$ git upstream-diff --diff-filter d
+...
+
+$ # etc.