summaryrefslogtreecommitdiff
path: root/plugins/lol
diff options
context:
space:
mode:
authorSébastien M-B <essembeh@gmail.com>2013-02-08 19:08:06 +0100
committerSébastien M-B <essembeh@gmail.com>2013-02-08 19:08:06 +0100
commit2595484a97d85496fdcdca99a23f52eecd9b1b43 (patch)
treefffe23d53a2a635f0861047fb058c8a2632414f7 /plugins/lol
parent8d23a3611086e9a13e7ad754c57fa8cc4797bfa9 (diff)
parent6e6cf4303712befb5a7fc3918494aefe4a65991f (diff)
downloadzsh-2595484a97d85496fdcdca99a23f52eecd9b1b43.tar.gz
zsh-2595484a97d85496fdcdca99a23f52eecd9b1b43.tar.bz2
zsh-2595484a97d85496fdcdca99a23f52eecd9b1b43.zip
Merge remote-tracking branch 'upstream/master'
Conflicts: lib/aliases.zsh
Diffstat (limited to 'plugins/lol')
-rw-r--r--plugins/lol/lol.plugin.zsh3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/lol/lol.plugin.zsh b/plugins/lol/lol.plugin.zsh
index e455527e7..ae065c12f 100644
--- a/plugins/lol/lol.plugin.zsh
+++ b/plugins/lol/lol.plugin.zsh
@@ -5,6 +5,7 @@ alias wtf='dmesg'
alias onoz='cat /var/log/errors.log'
alias rtfm='man'
+alias :3='echo'
alias visible='echo'
alias invisible='cat'
alias moar='more'
@@ -29,7 +30,7 @@ alias iminurbase='finger'
alias btw='nice'
alias obtw='nohup'
-alias nomz='ps -aux'
+alias nomz='ps aux'
alias nomnom='killall'
alias byes='exit'