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
GitHub suggests that you should make sure to only use \n as a newline character in git-handled repos. There’s an option to auto-convert: $ git config –global core.autocrlf true Of course, this is said to convert crlf to lf, while you want to convert cr to lf. I hope this still works … And then … Read more
You want to use git diff. git diff [<options>] <commit>..<commit> [–] [<path>…] Where <commit> is your branch name, the hash of a commit or a shorthand symbolic reference For instance git diff abc123..def567 or git diff HEAD..origin/master That will produce the diff between the tips of the two branches. If you’d prefer to find the … Read more
It should just be: git diff –cached –cached means show the changes in the cache/index (i.e. staged changes) against the current HEAD. –staged is a synonym for –cached. –staged and –cached does not point to HEAD, just difference with respect to HEAD. If you cherry pick what to commit using git add –patch (or git … Read more
Lets take a look at example advanced diff from git history (in commit 1088261f in git.git repository): diff –git a/builtin-http-fetch.c b/http-fetch.c similarity index 95% rename from builtin-http-fetch.c rename to http-fetch.c index f3e63d7..e8f44ba 100644 — a/builtin-http-fetch.c +++ b/http-fetch.c @@ -1,8 +1,9 @@ #include “cache.h” #include “walker.h” -int cmd_http_fetch(int argc, const char **argv, const char *prefix) +int … Read more
To compare the current branch against main branch: $ git diff –name-status main To compare any two branches: $ git diff –name-status firstbranch..yourBranchName There is more options to git diff in the official documentation (and specifically –name-status option).
git diff –name-only SHA1 SHA2 where you only need to include enough of the SHA hash to identify the commits. You can also do, for example git diff –name-only HEAD~10 HEAD~5 to see the differences between the tenth latest commit and the fifth latest (or so).
Since I’d already created these images, I thought it might be worth using them in another answer, although the description of the difference between .. (dot-dot) and … (dot-dot-dot) is essentially the same as in manojlds’s answer. The command git diff typically¹ only shows you the difference between the states of the tree between exactly … Read more
git log origin/master..HEAD You can also view the diff using the same syntax git diff origin/master..HEAD
Using Commit Ranges with Git Log When you’re using commit ranges like .. and … with git log, the difference between them is that, for branches A and B, git log A..B will show you all of the commits that B has that A doesn’t have, while git log A…B will show you both the … Read more