For other readers (and from this article): git has an option to display merge conflicts in diff3 format (by default it only displays the two files to be merged). You can enable it like so: git config –global merge.conflictstyle diff3 There’s really no reason you shouldn’t enable the diff3 style, because you frequently need the … Read more
To compare a local working directory against a remote branch, for example origin/master: git fetch origin master This tells git to fetch the branch named ‘master’ from the remote named ‘origin’. git fetch will not affect the files in your working directory; it does not try to merge changes like git pull does. git diff … Read more
If it was your most recent stash, git diff stash@{0} will do it. If not, you can use git stash list to get the index of which stash you want to compare to. To see the difference between the actual working copy and the stash you would need to commit it first. You could then … Read more
This histogram strategy was introduced in git 1.7.7 (Sept 2011), with the following description (as mentioned by the OP) “git diff” learned a “–histogram” option to use a different diff generation machinery stolen from jgit, which might give better performance. JGit includes src/org/eclipse/jgit/diff/HistogramDiff.java and tst/org/eclipse/jgit/diff/HistogramDiffTest.java The description there is fairly complete: HistogramDiff An extended form … Read more
You can find the branch point using git merge-base. Consider master the mainline and dev the branch whose history you are interested in. To find the point at which dev was branched from master, run: git merge-base –fork-point master dev We can now diff dev against this basis: git diff $(git merge-base –fork-point master dev)..dev … Read more
git diff –stat will show you the output you get when committing stuff which is the one you are referring to I guess. git diff –stat For showing exactly the line numbers that has been changed you can use git blame -p <file> | grep “Not Committed Yet” And the line changed will be the … Read more
git diff-tree -r –no-commit-id –name-only –diff-filter=ACMRT $commit_id git diff-tree -r $commit_id: Take a diff of the given commit to its parent(s) (including all subdirectories, not just the top directory). –no-commit-id –name-only: Do not output the commit SHA1. Output only the names of the affected files instead of a full diff. –diff-filter=ACMRT: Only show files added, … Read more
Perhaps there is a better answer, but the best solution I’ve found so far is this. First, you must control the definition of “whitespace” that Git is currently using. git config core.whitespace ‘-trailing-space,-indent-with-non-tab,-tab-in-indent’ Next, you must control the definition of a word used. Instead of just using git diff -w, add –word-diff-regex='[^[:space:]]’: git diff -w … Read more
First, make sure you’re using the coloured output (e.g. with git diff –color) and that you’ve enabled whitespace highlighting with (e.g.) git config color.diff.whitespace “red reverse” This might not work in all cases, however, as git doesn’t appear to highlight trailing whitespace for removed lines. To see whitespace that you’ve deleted, simply use git diff … Read more
The default output for git diff is the list of changes which have not been committed / added to the index. If there are no changes, then there is no output. git diff [–options] [–] […] This form is to view the changes you made relative to the index (staging area for the next commit). … Read more