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
To compare two .dll files you can use ildasm or any other tool for geting IL code. I have created a sample with embedded ildasm in the dll file so that you can use it on every machine. When we disassemble an assembly we check if the ildasm.exe file exists in the executing assembly folder … Read more
The tool NDepend offers many features to handle .NET code diff. The panel Search by Change is dedicated to browse assemblies code diff: Many code rules that constraint diff and evolution are proposed. They can be a good start to write your own ones or adapt them to your needs. For example look at the … Read more
I want to be able to perform this diff before merging, including on files without merge conflicts. You just have to set up the index as you like, you never have to commit results. The way to set up for exactly what was asked, straight diffs-since-base with no merge prep, is git merge -s ours … Read more
git diff -G”.” The -G flag filters out any file where a line that matches a regular expression has not been added or removed. In this case the regular expression provided is “.” which matches any line. So the argument -G”.” will filter out files where no lines have been added or removed. You will … Read more
Try the following: $ git diff > full_diff.txt $ git diff -G “your pattern” > matching_diff.txt You can then compare the two like so: $ diff matching_diff.txt full_diff.txt If all changes match the pattern, full_diff.txt and matching_diff.txt will be identical, and the last diff command will not return anything. If there are changes that do … Read more
All the answers I’ve seen here address the question “how could I prevent Vim from adding a newline character at the end of the file?“, while the question was “Why would Vim add a new line at the end of a file?“. My browser’s search engine brought me here, and I didn’t find the answer … Read more
If you mean the changes between the working tree and your HEAD commit (i.e. both staged and unstaged changes together) this is just done with: git diff HEAD