summaryrefslogtreecommitdiff
path: root/.config/bash/aliases.sh
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-01-27 20:52:59 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-01-27 20:52:59 -0500
commit786fcda41a731654dd2de7496d5f28bc7bb19743 (patch)
treeab557aa22a6463fd15667ec738b12f7fd78d7aa1 /.config/bash/aliases.sh
parent614636d8e5a1f643d3c91d0d5e52482aef38bb5e (diff)
parent5f7de477be298f158369862c1a3cc80286fc7e32 (diff)
Merge remote-tracking branch 'origin/master' into build64-par
Conflicts: .kde/share/apps .kde/share/config .kde4
Diffstat (limited to '.config/bash/aliases.sh')
-rw-r--r--.config/bash/aliases.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/.config/bash/aliases.sh b/.config/bash/aliases.sh
index 8241b95..0964a83 100644
--- a/.config/bash/aliases.sh
+++ b/.config/bash/aliases.sh
@@ -37,7 +37,7 @@ alias l='ls -CF'
######################################################################
#alias rm='gvfs-trash'
alias ssh='ssh -XC'
-alias sed='sed --follow-symlinks'
+#alias sed='sed --follow-symlinks' # breaks sed 4.2.2
alias tree='tree --charset utf8'
alias cd=pushd
alias gitk='gitk --all --date-order'
@@ -53,7 +53,6 @@ unset redshift
######################################################################
# Some almost-function aliases #
######################################################################
-xterm-title() { echo "];$@"; } # Oh, wait this one *is* a function
alias lock="clear; away -C 'This terminal is locked'"
-alias plock="xterm-title Terminal Locked;lock"
+alias plock="term-title Terminal Locked;lock"
mvln() { mv $1 $2; ln -s $2 $1; }