Commands using diff sorted by votes

Commands using diff (119)

sorted by

diff recursively, ignoring CVS control files

This will cause diff to ignore any files whose path matches "*CVS*", ie any CVS control files.
This is sample output - yours may be different.
0

diff -x "*CVS*" -r <path-1> <path-2> [<path-3>]

sanmiguel · 2010-02-17 11:08:17 5
compile source & then remove the dev tools you needed to install

on a dpkg managed system this PATTERN will help you generate .deb files from source AND remove all the dev libs you had to install. i hate cluttering up my machine with rouge packages and headers. it would be pretty darn easy on rpm systems as well. i just dont have a rpm managed system to test on right now. NOTE, you sharp ones will notice that it uninstalls the deb you just made! yeah, but the deb is still there to do with it what you want, like re install it. or you can just grep -v after the diff
This is sample output - yours may be different.
0

dpkg-query -l > 1.lst; sudo apt-get install -y build-essential; ./configure; make; sudo checkinstall -D make install; dpkg-query --list > 2.lst; diff 1.lst 2.lst | grep '^>' | awk '{print $3}' | xargs sudo apt-get remove -y --purge

danlangford · 2010-06-16 22:06:07 4
diff from last committed revision in Mercurial
This is sample output - yours may be different.
0

hg diff -r$((`hg -q par | cut -d":" -f1`-1))

michaelmior · 2010-10-12 20:32:22 3
Check the MD5

Use zsh process substitution syntax.
This is sample output - yours may be different.
0

diff -ua <(w3m -dump http://www.php.net/downloads.php|fgrep -A1 '5.2.15 (tar.bz2)'|awk '/md5:/{print $2}') <(md5sum php-5.2.15.tar.bz2|awk '{print $1}')

sugitaro · 2010-12-10 11:31:07 3
Create a tar of modified/added files since revision 1792.

The result of this command is a tar with all files that have been modified/added since revision 1792 until HEAD. This command is super useful for incremental releases.
This is sample output - yours may be different.
0

svn diff -r 1792:HEAD --summarize | awk '{if ($1 != "D") print $2}'| xargs -I {} tar rf incremental_release.tar {}

windfold · 2011-04-05 15:00:49 3
Edit all different files from 2 directories with gvim in difference mode (gvim -d)

LC_ALL=C is here to always grep on "differ" whatever your language env. xargs -n 2 to run gvim -d with 2 arguments gvim --nofork to use only one instance of gvim
This is sample output - yours may be different.
0

LC_ALL=C diff -q dir1 dir2 | grep differ | awk '{ print $2, $4 }' | xargs -n 2 gvim --nofork -d

brock · 2011-09-06 11:50:33 3
Diff with Sections/Headers

Maybe very limited in its applicability but could be of use at times. Show Sample Output
This is sample output - yours may be different.
```
 Header1
-   y
+   f
 Header2
-   C
+   D
 Header3
-   3
+   1
```
0

diff -U 9999 file_a file_b | tail -n +3 | grep -P "^(\ Header|\-|\+)"

nnutter · 2011-09-21 21:33:40 5
Create patch file for two directories

Removes an extra character and space.
This is sample output - yours may be different.
0

diff -ru originDir updateDir > result.patch

rjgoldsborough · 2011-10-23 11:41:05 3
display list of files in a directory sorted by amount of lines different with original.txt.
This is sample output - yours may be different.
0

for f in $(ls -A ./dir); do echo -n $f && diff original.txt ./dir/$f | wc -l ; done | perl -ne 'my $h={}; while (<>) { chomp; if (/^(\S+?)\s*(\d+?)$/){$h->{$1}=$2;} }; for my $k (sort { $h->{$a} $h->{$b} } keys %$h ){ print "$k\t$h->{$k}\n"}'

1vq9 · 2011-11-15 06:02:12 3
diff two css files to create an overriding css (e.g. for wordpress child themes)

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. Show Sample Output
This is sample output - yours may be different.
```
+++ style.css	2012-01-12 08:33:13.486877866 +0100
@@ -1,1324 +1,1427 @@
 /* =Layout
 -------------------------------------------------------------- */
 
 /*
 LAYOUT: Two columns
 DESCRIPTION: Two-column fixed layout with one sidebar right of content
 */
 
 #container {
 	float: left;
+	margin: 0 -240px 0 38px;
 	width: 100%;
 }

 #content {
+	margin: 0 250px 0 0px;
 }
```
0

diff -U99999 original.css modified.css | awk '/^-/{next} {f=f"\n"$0} /^\+.*[^ ]/{yes=1} /}/ {if(yes){print f} f="";yes=0}'

unhammer · 2012-01-12 07:57:22 4
Compare latest changes in locally edited file with SVN copy of a file

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. Show Sample Output
This is sample output - yours may be different.
```
bbbco> /home/bbbco/selenium/tests/src/com/bbbco/standardtest>svn diff StandardTest.java 
200c200
<             sInterface.waitForPage(minTime);
---
>             sInterface.waitForPage(maxTime);
271c271
< }
\ No newline at end of file
---
> }
```
0

svn diff <FILE>

bbbco · 2012-01-30 16:47:48 14
Send SVN diff to Meld
This is sample output - yours may be different.
0

svn diff --diff-cmd='meld' -r 100:BASE FILE

0disse0 · 2012-02-03 18:00:07 3
Display diffed files sidebyside, with minimal differences, using the full width of the terminal.

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.
This is sample output - yours may be different.
0

diff -dbByw $COLUMNS FILE1 FILE2

DewiMorgan · 2012-02-28 03:19:20 6
List only locally modified files with CVS
This is sample output - yours may be different.
0

cvs -q diff --brief | grep file | cut -d/ -f3- | cut -d',' -f1

chstr · 2012-03-07 12:08:21 3
Copy all file differences to an existing mirror location

I use this a lot to sync changes between folders that don't share a SVN or GIT repository. If you want to preview the command before executing, just leave out the last part ("| sh")
This is sample output - yours may be different.
0

diff -Naur /source/path /target/path --brief | awk '{print "cp " $2 " " $4}' | sh

johanadriaans · 2012-04-13 12:07:20 4
watch iptables counters

this alternative shows the differences as they occur so that they are made plain Show Sample Output
This is sample output - yours may be different.
```
@@ -28 +28 @@
-  339 27684 zone_lan_forward  all  --  br-lan *       0.0.0.0/0            0.0.0.0/0           
+  340 27768 zone_lan_forward  all  --  br-lan *       0.0.0.0/0            0.0.0.0/0           
```
0

while true; do iptables -nvL > /tmp/now; diff -U0 /tmp/prev /tmp/now > /tmp/diff; clear; cat /tmp/diff; mv /tmp/now /tmp/prev; slee p 1; done

unixmonkey34223 · 2012-04-15 00:02:33 3
revert the unstaged modifications in a git working directory
This is sample output - yours may be different.
0

git diff | git apply --reverse

samer · 2012-05-15 22:36:33 3
Better git diff, word delimited and colorized
This is sample output - yours may be different.
0

git diff -U10|dwdiff --diff-input -c|less -R

daa · 2012-08-15 03:53:26 3

Look for free ip's in a given /24 subnet.

The command will make it easy to determine free IP ranges in a crowded sub-net. Show Sample Output

SUBNET="192.168.41" ; diff -y <(nmap -sP -n ${SUBNET}.0/24 | grep ${SUBNET}. | awk '{print $5}' | sort -t"." -k4 -n) <(for i in $(seq 1 254); do echo ${SUBNET}.$i; done)

michel_p · 2012-08-28 09:11:18 4

Compares two source directories, one original and one post configure and deletes the differences in the source folder

Good for when your working on building a clean source install for RPM packaging or what have you. After testing, run this command to compare the original extracted source to your working source directory and it will remove the differences that are created when running './configure' and 'make'.
This is sample output - yours may be different.
0

diff ../source-dir.orig/ ../source-dir.post/ | grep "Only in" | sed -e 's/^.*\:.$\<.*\>$/\1/g' | xargs rm -r

bigc00p · 2012-10-17 14:12:32 9
neat diff of remote files owned by root on different systems
This is sample output - yours may be different.
0

diff -u <(ssh -t user@host1 sudo cat /dir1/file1) <(ssh -t user@host2 sudo cat /dir2/file2)

moosaka · 2012-11-09 09:12:56 4
SVN Export files that were modified between given revisions.

Get the list of changed files between revision 43 and HEAD revision: svn diff . -r43:HEAD --summarize Strip extra 8 characters from every line: cut -c9-99999 Copy the listed files to home/me/destination: cpio -pvdmu ~/destination Make a plain copy (-p), list files being copied (-v), create needed directories (-d), preserve modification time (-m), overwrite unconditionally (-u) Show Sample Output
This is sample output - yours may be different.
```
/home/me/destination/lib/model/ActivityTable.class.php
/home/me/destination/lib/model/ScheduleTable.class.php
/home/me/destination/lib/form/Activity.class.php
/home/me/destination/lib/form/Schedule.class.php
```
0

svn diff . -r43:HEAD --summarize | cut -c9-99999 | cpio -pvdmu ~/destination

Sebasg · 2012-12-26 05:02:59 4

Copy modified files between two Git commits

Show Sample Output

git diff --name-only --diff-filter=AMXTCR HEAD~2 HEAD | xargs -l -I{} cp --parents --verbose "{}" target_dir

batandwa · 2013-02-11 08:12:40 4

diff files ignoring comments and blank lines (lines starting with #)

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.
This is sample output - yours may be different.
0

diff -u <(grep -vE '^(#|$)' file1) <(grep -vE '^(#|$)' file2)

taintedkernel · 2013-02-12 13:59:39 36
diff files ignoring comments and blank lines (lines starting with #)
This is sample output - yours may be different.
0

diff -BI '^#' file{1,2}

zlemini · 2013-02-17 11:53:41 38
‹ First < 2 3 4 5 >

What's this?

commandlinefu.com is the place to record those command-line gems that you return to again and again. That way others can gain from your CLI wisdom and you from theirs too. All commands can be commented on, discussed and voted up or down.

Share Your Commands

Check These Out

Prepend a text to a file.

The original command is great, but I often want to prepend to every line.

Print every Nth line

Sometimes commands give you too much feedback. Perhaps 1/100th might be enough. If so, every() is for you. $ my_verbose_command | every 100 will print every 100th line of output. Specifically, it will print lines 100, 200, 300, etc If you use a negative argument it will print the *first* of a block, $ my_verbose_command | every -100 It will print lines 1, 101, 201, 301, etc The function wraps up this useful sed snippet: $ ... | sed -n '0~100p' don't print anything by default $ sed -n starting at line 0, then every hundred lines ( ~100 ) print. $ '0~100p' There's also some bash magic to test if the number is negative: we want character 0, length 1, of variable N. $ ${N:0:1} If it *is* negative, strip off the first character ${N:1} is character 1 onwards (second actual character).

clean up syntax and de-obfuscate perl script

the command show can be run in vim, here is the same thing on the command line $ cat script.pl | perl -MO=Deparse | perltidy

Get fully qualified domain names (FQDNs) for IP address with failure and multiple detection

vim's pastetoggle: when you press f9 'paste' is on , press f9 again and 'paste' is off, and so forth (works in insert-mode and command-mode)

set history file length

set how many commands to keep in history Default is 500 Saved in /home/$USER/.bash_history Add this to /home/$USER/.bashrc HISTFILESIZE=1000000000 HISTSIZE=1000000

list files recursively by size

Get notified when a job you run in a terminal is done, using NotifyOSD

This is an alias you can add to your .bashrc file to get notified when a job you run in a terminal is done. example of use sleep 20; alert Source:http://www.webupd8.org/2010/07/get-notified-when-job-you-run-in.html

Use top to monitor only all processes with the same name fragment 'foo'

top accecpts a comma separated list of PIDs.

Typing the current date ( or any string ) via a shortcut as if the keys had been actually typed with the hardware keyboard in any application.

That works in all softs, CLI or GUI... I don't want to waste time to all the time typing the same stuff . So, I have that command in my window manager shortcuts ( meta+l ). All the window managers have editable shortcuts AFAIK. If not, or you don't want to use it that way, you can easily use the xbindkeys soft. I you're using kde4, you can run : $ systemsettings then open "inputs actions" and create a new shortcut. For Gnome take a look there : http://www.cyberciti.biz/faq/howto-create-keyboard-shortcuts-in-gnome/ A more advanced one, with strings and newlines : $ xvkbd -xsendevent -text "---8

Stay in the loop…

Follow the Tweets.

Every new command is wrapped in a tweet and posted to Twitter. Following the stream is a great way of staying abreast of the latest commands. For the more discerning, there are Twitter accounts for commands that get a minimum of 3 and 10 votes - that way only the great commands get tweeted.

» http://twitter.com/commandlinefu
» http://twitter.com/commandlinefu3
» http://twitter.com/commandlinefu10

Subscribe to the feeds.

Use your favourite RSS aggregator to stay in touch with the latest commands. There are feeds mirroring the 3 Twitter streams as well as for virtually every other subset (users, tags, functions,…):

Subscribe to the feed for:

» all commands
» commands with 3 up-votes (commandlinefu3)
» commands with 10 up-votes (commandlinefu10)
» commands using diff

Commands using diff (119) the last day the last week the last month all time sorted by date votes

What's this?

Check These Out

Stay in the loop…

Commands using diff (119)

sorted by