Commands tagged diff

Runs a diff on two files ignore comments and blank lines (diff -I=RE does not work as expected). Adapted from a post found on stackexchange.

Execute a process or list of commands in the given interval and output the difference in output.

Is this not the same

Use vim's diff mode to edit two or more files in one window. The '+diffoff!' turns off diff highlighting when the session is started.

Use ctrl+w + ctrl+w to switch between windows.

Outputs the number of different pixels.

2 params to increase tolerance:

* thumbnails size

* fuzz, the color distance tolerance

See http://en.positon.org/post/Compare-/-diff-between-two-images for more details.

Compare the ls -Rl output of two directories in meld (you can also use diff -y instead of meld).

The normal output of 'diff' is a wonderful thing. But just sometimes, you want something that is a little more... well... readable.

This is that command.

-d - (optional) find the minimal set of changes

-b - (optional) ignore changes in the amount of whitespace

-B - (optional) ignore changes that just insert or delete blank lines

-y - this is where the magic happens! Use the side-by-side output format.

-w $COLUMNS - more magic! Instead of using 80 columns, use the current width of the terminal.

Output of this command is the difference of recursive file lists in two directories (very quick!).

To view differences in content of files too, use the command submitted by mariusbutuc (very slow!):

If you have ever edited a locally checked out version of a file to tweak it for testing purposes, and came back to it over a weekend, you might have forgotten what you exactly changed. This command helps you see the differences between the the checked in SVN version, and the one you tweaked.

This will extract the differing CSS entries of two files. I've left the initial character (plus or space) in output to show the real differing line, remove the initial character to get a working CSS file. The output CSS file is usable by either adding it in a below the to original.css, or by only using the output but adding @import url("original.css"); in the beginning.

This is very useful for converting Wordpress theme copies into real Wordpress child themes.

Could exclude common lines within entries too, I guess, but that might not be worth the complexity.

Requires wdiff. Prints the word-by-word diff with the old version highlighted in red, and the new in green. Change the colors by altering 41m and 42m. 45m is more of a magenta and may be easier to read.

Diffs two xml files by formatting them first using xmllint and then invoking diff.

Usage: diffxml XMLFile1 XMLFile2

Maybe very limited in its applicability but could be of use at times.

Upload/download newer version of any file with less size and high speed.

To remake the new file use

http://hints.macworld.com/article.php?story=20070408062023352

Description is moved to "Sample output" because the html sanitizer for commandlinefu breaks the examples..

M - current revision, N - older revision

This form is used in patches, svn, git etc. And I've created an alias for it:

alias diff='diff -Naur --strip-trailing-cr'

The latter option is especially useful, when somebody in team works in Windows; could be also used in commands like