The important thing to realize about git diff A B is that it only ever shows you the difference between the states of the tree between exactly two points in the commit graph – it doesn’t care about the history. The .. and … notations used for git diff have the following meanings: So when … Read more
Use the –word-diff option for git diff For example, git diff –word-diff=color: and git diff –word-diff=plain: There’s also –word-diff-regex=<regex> See git help diff for more info.
Actually, git diff is between index and working tree. It just so happens that until you have staged changes to the index (with git add) that its contents will be identical to the HEAD commit. git diff HEAD is between repo and working tree. See 365git.tumblr.com post:
The simplest method is to simply use a wildcard: git diff — ‘*AssemblyInfo.cs’ At least this works on my Git v1.8.4, bash 3.2, and zsh 5.7.
See the changes of a specific commit: git diff <commit-sha> -p Or, git show –decorate <commit-sha> # See ‘Author’, ‘Date’ and ‘diff’ See the diff of two commits: git diff <commit1> <commit2> See the file changes for a specific commit: git show <commit>:<file> See all the changes for a time duration (say, 1 day): git … Read more
the old version of the PR You can do so directly on GitHub: see “Find committer of a force push on GitHub” Clicking the “force-pushed” link will show a two dot comparison between the two commits. Original answer: 2016 That would be only available in the reflog of the remote repo, which would include the … Read more
TL;DR In the following git-diff syntax, git diff [–options] <commit> <commit> [–] [<path>…] the first <commit> corresponds to the base commit, the second <commit> corresponds to the commit to compare to the base commit. Using a mathematically inspired notation, git diff <x> <x+∆x> will show you the difference ∆x, whereas git diff <x+∆x> <x> will … Read more
One more minute of Googling found the answer of course, answering my own question: git diff –cached
The exclude pathspec trick, described in Making ‘git log’ ignore changes for certain paths, works here: git diff –stat — . ‘:(exclude)file/to/exclude.txt’ or, if you are in a subdirectory: git diff –stat — :/ ‘:(exclude,top)file/to/exclude.txt’ The latter can be spelled in various ways. For instance, this also works: git diff –stat ‘:(top)’ :!/file/to/exclude.txt as does: … Read more
Use git diff. git diff [<options>] <commit>..<commit> [–] [<path>…] <commit> is a branch name, a commit hash, or a shorthand symbolic reference. Examples: git diff abc123..def567 git diff HEAD..origin/master That will produce the diff between the tips of the two branches. If you’d prefer to find the diff from their common ancestor to test, you … Read more