Here is a solution that is working well for me. I’ve written up the solution and some additional missing documentation on the git (log|diff) -G<regex> option. It is basically using the same solution as in previous answers, but specifically for comments that start with a * or a #, and sometimes a space before the … 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
As of Git 2.15, git diff now supports detection of moved lines with the –color-moved option. It even detects moves between files. It works, obviously, for colorized terminal output. As far as I can tell, there is no option to indicate moves in plain text patch format, but that makes sense. For default behavior, try … 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
Use git log to view the commit history. Each commit has an associated revision specifier that is a hash key (e.g. 14b8d0982044b0c49f7a855e396206ee65c0e787 and b410ad4619d296f9d37f0db3d0ff5b9066838b39). To view the difference between two different commits, use git diff with the first few characters of the revision specifiers of both commits, like so: # diff between commits 14b8… and … Read more
To see the diff for a particular COMMIT hash, where COMMIT is the hash of the commit: git diff COMMIT~ COMMIT will show you the difference between that COMMIT‘s ancestor and the COMMIT. See the man pages for git diff for details about the command and gitrevisions about the ~ notation and its friends. Alternatively, … Read more
By default git diff truncates its output to fit into a 80-column terminal. You can override this by specifying values using the –stat option: –stat[=<width>[,<name-width>[,<count>]]] Generate a diffstat. You can override the default output width for 80-column terminal by –stat=<width>. The width of the filename part can be controlled by giving another width to it … Read more
Try git diff k73ud^..dj374 to make sure to include all changes of k73ud in the resulting diff. git diff compares two endpoints (instead of a commit range). Since the OP want to see the changes introduced by k73ud, he/she needs to difference between the first parent commit of k73ud: k73ud^ (or k73ud^1 or k73ud~). That … Read more
Copy the diff file to the root of your repository, and then do: git apply yourcoworkers.diff More information about the apply command is available on its man page. By the way: A better way to exchange whole commits by file is the combination of the commands git format-patch on the sender and then git am … Read more
Try git difftool Use git difftool instead of git diff. You’ll never go back. UPDATE to add an example usage: Here is a link to another stackoverflow that talks about git difftool: How do I view ‘git diff’ output with my preferred diff tool/ viewer? For newer versions of git, the difftool command supports many … Read more