diff options
author | 2012-12-05 00:44:09 +0100 | |
---|---|---|
committer | 2012-12-05 00:44:09 +0100 | |
commit | 6278e2e634b05027d31220afd328a9f7fe77c6f1 (patch) | |
tree | 3dbec6a3880ca980694def0d737a477b68254691 /.emacs.d/eshell/alias | |
parent | fa717d86a07d009ab324a40cd8dbf539e61a9da3 (diff) | |
parent | 15adc911da3f5b527c74b6bb67d677898d6a173e (diff) | |
download | dotfiles-6278e2e634b05027d31220afd328a9f7fe77c6f1.tar.gz dotfiles-6278e2e634b05027d31220afd328a9f7fe77c6f1.zip |
Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
.emacs.d/site-lisp/oni.el
Diffstat (limited to '.emacs.d/eshell/alias')
-rw-r--r-- | .emacs.d/eshell/alias | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/.emacs.d/eshell/alias b/.emacs.d/eshell/alias index 940108a..d98e2f5 100644 --- a/.emacs.d/eshell/alias +++ b/.emacs.d/eshell/alias @@ -1,8 +1,9 @@ -alias git git --no-pager $* -alias rm rm -v $* -alias sudo *sudo $* -alias ncmpcpp ansi-term ncmpcpp ncmpcpp -alias listen eshell-exec-visual mplayer http://usa7-vn.mixstream.net/listen/8248.pls -alias o find-file $1 -alias d dired $1 +alias hgit hgit --no-pager $* alias newsbeuter ansi-term newsbeuter newsbeuter +alias d dired $1 +alias o find-file $1 +alias listen eshell-exec-visual mplayer http://usa7-vn.mixstream.net/listen/8248.pls +alias ncmpcpp ansi-term ncmpcpp ncmpcpp +alias sudo *sudo $* +alias rm rm -v $* +alias git git --no-pager $* |