summaryrefslogtreecommitdiff
path: root/.bash_aliases
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-05-30 11:36:32 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-05-30 11:36:32 -0400
commitdbab2a06f142894f446f1f66b637242862dcd7bf (patch)
treec8888e76f39647edad67abd73e74605b1d95b3aa /.bash_aliases
parentbd8512e48b8ca0f44171c06578da7a5f3cd6663f (diff)
parent344bd61ba0d7d06b3cec6499ef6b4058f9d64626 (diff)
Merge branch 'master' of gitorious.org:lukeshu-dotfiles/lukeshu-dotfiles
Conflicts: .emacs .emacs.d/custom.el
Diffstat (limited to '.bash_aliases')
-rw-r--r--.bash_aliases6
1 files changed, 4 insertions, 2 deletions
diff --git a/.bash_aliases b/.bash_aliases
index 0788501..de1a321 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -1,6 +1,6 @@
#!/bin/bash
# The above line probably should never be *used* in this file, but it
-# lets editors know that this is BASH syntax.
+# lets text editors know that this is BASH syntax.
######################################################################
# Set up colors and settings for ls/dir/vdir #
@@ -39,6 +39,8 @@ alias l='ls -CF'
alias ssh='ssh -XC'
alias sed='sed --follow-symlinks'
alias tree='tree --charset utf8'
+alias cd=pushd
+alias gitk='gitk --all --date-order'
######################################################################
# Remember lat/long for redshift #
@@ -52,7 +54,7 @@ alias redshift="$redshift"
######################################################################
#alias serva='ssh luke@servb.ath.cx -p3440'
#alias phpdoctor='php /usr/gnu/www/0-other/phpdoctor-head/phpdoc.php'
-function xterm-title () { echo "];$@"; } # Oh, wait this one is
+function 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"