git://git.iain.cx/iain
/
profile.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't use PROMPT_COMMAND on dtterm.
[profile.git]
/
.profile.d
/
aliases.bashrc
diff --git
a/.profile.d/aliases.bashrc
b/.profile.d/aliases.bashrc
index
c858a7a
..
49d6ab9
100644
(file)
--- a/
.profile.d/aliases.bashrc
+++ b/
.profile.d/aliases.bashrc
@@
-1,9
+1,12
@@
# $Id$
# $Id$
-alias grep='grep --color=auto'
+
grep -V 2>/dev/null | grep GNU >/dev/null &&
alias grep='grep --color=auto'
alias knh='kill_known_host'
alias l='ls'
alias ls='/bin/ls $LS_OPTIONS'
alias knh='kill_known_host'
alias l='ls'
alias ls='/bin/ls $LS_OPTIONS'
-alias vim='vim +syn\ on'
-alias vi='vim'
+if which vim 2>/dev/null | grep ^/ >/dev/null; then
+ alias vim='vim +syn\ on'
+ alias vi='vim'
+fi
alias debug='valgrind --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=5 --verbose --time-stamp=yes --track-fds=yes'
alias debug='valgrind --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=5 --verbose --time-stamp=yes --track-fds=yes'
+alias session='screen -rx -S session || screen -S session'
alias svnfind='find . -type f ! -path "*/.svn/*"'
alias svnfind='find . -type f ! -path "*/.svn/*"'