From: jkratoch <>
Date: Sat, 25 Sep 2010 13:35:10 +0000 (+0000)
Subject: {diff,diffc}+=-d
X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=commitdiff_plain;h=9e9d0a1f2d45c9d02a6c885f78415e44524ad205

{diff,diffc}+=-d
---

diff --git a/.bashrc b/.bashrc
index 32ca2bb..f876225 100644
--- a/.bashrc
+++ b/.bashrc
@@ -150,7 +150,7 @@ eval '
 	function disass { objdump -D --target=binary --architecture=i386 "$@"; }
 	function cal {(unset cal; ( cal -m "$@"; ); );}
 	function vncreadonly { vncviewer -FullColor -Shared -ViewOnly "$@"; }
-	function diff {(unset diff; ( diff -up "$@"; ); );}
+	function diff {(unset diff; ( diff -dup "$@"; ); );}
 	function rpmbuildlocal { nice rpmbuild --define "_topdir $PWD" --define "_builddir $PWD" --define "_rpmdir $PWD" --define "_sourcedir $PWD" --define "_specdir $PWD" --define "_srcrpmdir $PWD" --define "_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" "$@"; rmdir &>/dev/null BUILDROOT; }
 	function gdbn { gdb -nx --command=~/.gdbinit "$@"; }
 	function hd { od -Ax -tx1; }
@@ -277,7 +277,7 @@ function debuginfo { if test -n "$*";then echo "$*";else cat;fi \
 	|xargs rpm -qf|xargs rpmquery --qf '%{SOURCERPM}\n'|sed 's/-[^-]*-[^-]*[.]src[.]rpm$/-debuginfo/'|sort -u; }
 function ipcsrmall { ipcs|awk '/- Shared Memory/{x="-m"}/- Semaphore/{x="-s"}/^0x/{print "ipcrm "x" "$2}'; }
 function eog {(unset eog; touch /tmp/eog.$$;eog "$@" {,,,,,,,,,}/tmp/eog.$$;rm -f /tmp/eog.$$; );}
-function diffc { diff -up "$@"|grep -v '^\(Only in \|Binary files\)'; }
+function diffc { diff -dup "$@"|grep -v '^\(Only in \|Binary files\)'; }
 function diffi { diffc -X ~/.diffi.list "$@" | diffdecvs; }
 function cvs {(unset cvs
 	local _opts _opts_d _now _line _o