From the diff man page: -q Report only whether the files differ, not the details of the differences. -r When comparing directories, recursively compare any subdirectories found. Example command: diff -qr dir1 dir2 Example output (depends on locale): $ ls dir1 dir2 dir1: same-file different only-1 dir2: same-file different only-2 $ diff -qr … Read more
I believe cmp will stop at the first byte difference: cmp –silent $old $new || echo “files are different”
Aside from the ones you mention, I only use the following frequently when diffing: :diffupdate :diffu -> recalculate the diff. It is useful when, after making several changes, Vim isn’t showing minimal changes anymore. Note that it only works if the files have been modified inside vimdiff. Otherwise, use: :e to reload the files if … 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 view a commit as a diff/patch file, just add .diff or .patch to the end of the URL, for example: https://github.com/weppos/whois/pull/90 https://github.com/weppos/whois/pull/90.diff https://github.com/weppos/whois/pull/90.patch
Run this in the CMD shell or batch file: FC file1 file2 FC can also be used to compare binary files: FC /B file1 file2
The comm command (short for “common”) may be useful comm – compare two sorted files line by line #find lines only in file1 comm -23 file1 file2 #find lines only in file2 comm -13 file1 file2 #find lines common to both files comm -12 file1 file2 The man file is actually quite readable for this.
With recent git versions you can git add -N the file (or –intent-to-add), which adds a zero-length blob to the index at that location. The upshot is that your “untracked” file now becomes a modification to add all the content to this zero-length file, and that shows up in the “git diff” output. git diff … Read more
Omg, drivers and awk to exclude a lousy file ? Since git 1.9 something you can: git diff — . ‘:(exclude)db/irrelevant.php’ ‘:(exclude)db/irrelevant2.php’ (On Windows, replace the single quotes ‘ by double quotes “.) Ah, elegance! See the quoted answer and for details this answer by @torek
You can use the diff command for that: diff -bur folder1/ folder2/ This will output a recursive diff that ignore spaces, with a unified context: b flag means ignoring whitespace u flag means a unified context (3 lines before and after) r flag means recursive