If you’re working with small databases I’ve found running mysqldump on both databases with the –skip-comments and –skip-extended-insert options to generate SQL scripts, then running diff on the SQL scripts works pretty well. By skipping comments you avoid meaningless differences such as the time you ran the mysqldump command. By using the –skip-extended-insert command you … Read more
You can do: git diff master~20:pom.xml pom.xml … to compare your current pom.xml to the one from master 20 revisions ago through the first parent. You can replace master~20, of course, with the object name (SHA1sum) of a commit or any of the many other ways of specifying a revision. Note that this is actually … Read more
For end of line use: git diff –ignore-space-at-eol Instead of what are you using currently: git diff -w (–ignore-all-space) For start of line… you are out of luck if you want a built in solution. However, if you don’t mind getting your hands dirty there’s a rather old patch floating out there somewhere that adds … Read more
You can actually compare files natively right in Sublime Text. Navigate to the folder containing them through Open Folder… or in a project Select the two files (ie, by holding Ctrl on Windows or ⌘ on macOS) you want to compare in the sidebar Right click and select the Diff files… option.
You can invoke devenv.exe /diff list1.txt list2.txt from the Visual Studio Developer Command Prompt or, if a Visual Studio instance is already running, you can type Tools.DiffFiles in the Command window, with a handy file name completion:
I think pressing Q should work.
Man pages for diff suggest no solution for colorization from within itself. Please consider using colordiff. It’s a wrapper around diff that produces the same output as diff, except that it augments the output using colored syntax highlighting to increase readability: diff old new | colordiff or just: colordiff old new Installation: Ubuntu/Debian: sudo apt-get … 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
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 can simply pass the 2 commits to git diff like : -> git diff 0da94be 59ff30c > my.patch -> git apply my.patch